| commit | 17771551063fccded1ce2dfa402e9e884d50a788 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Mar 07 00:58:40 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Mar 07 00:58:40 2018 +0000 |
| tree | 25d005f6a8808ef812864089ac386f7e7e702da0 | |
| parent | 402bedf4033ef2c9d00a01a7792f4b0b10c263c5 [diff] | |
| parent | c8d18263d4d9a8e1648fc472093ce0cc50a651b7 [diff] |
Merge "Add check preventing div0 issue"
diff --git a/camera/ndk/include/camera/NdkCameraMetadata.h b/camera/ndk/include/camera/NdkCameraMetadata.h index f2aec98..bdb1587 100644 --- a/camera/ndk/include/camera/NdkCameraMetadata.h +++ b/camera/ndk/include/camera/NdkCameraMetadata.h
@@ -36,6 +36,7 @@ #ifndef _NDK_CAMERA_METADATA_H #define _NDK_CAMERA_METADATA_H +#include <stdint.h> #include <sys/cdefs.h> #include "NdkCameraError.h"
diff --git a/media/libaudioclient/ToneGenerator.cpp b/media/libaudioclient/ToneGenerator.cpp index cfb5be6..5338059 100644 --- a/media/libaudioclient/ToneGenerator.cpp +++ b/media/libaudioclient/ToneGenerator.cpp
@@ -1029,7 +1029,7 @@ bool lResult = false; status_t lStatus; - if ((toneType < 0) || (toneType >= NUM_TONES)) + if (toneType >= NUM_TONES) return lResult; toneType = getToneForRegion(toneType);