Merge "Fix misc-macro-parentheses warnings." am: 64d4f64af0

am: 5405ce02c4

* commit '5405ce02c45b55c0ba12fd3131ae329506e91f94':
  Fix misc-macro-parentheses warnings.

Change-Id: I94cd974549d819d7a43733636ecd4a6e464b76eb

drm/common/IDrmManagerService.cpp

@@ -33,7 +33,7 @@
 
 #include "IDrmManagerService.h"
 
-#define INVALID_BUFFER_LENGTH -1
+#define INVALID_BUFFER_LENGTH (-1)
 #define MAX_BINDER_TRANSACTION_SIZE ((1*1024*1024)-(4096*2))
 
 using namespace android;

drm/common/ReadWriteUtils.cpp

@@ -30,7 +30,7 @@
 
 using namespace android;
 
-#define FAILURE -1
+#define FAILURE (-1)
 
 String8 ReadWriteUtils::readBytes(const String8& filePath) {
     FILE* file = NULL;

drm/drmserver/DrmManager.cpp

@@ -33,7 +33,7 @@
 #include "DrmManager.h"
 #include "ReadWriteUtils.h"
 
-#define DECRYPT_FILE_ERROR -1
+#define DECRYPT_FILE_ERROR (-1)
 
 using namespace android;
 

drm/libdrmframework/DrmManagerClientImpl.cpp

@@ -28,7 +28,7 @@
 
 using namespace android;
 
-#define INVALID_VALUE -1
+#define INVALID_VALUE (-1)
 
 Mutex DrmManagerClientImpl::sMutex;
 sp<IDrmManagerService> DrmManagerClientImpl::sDrmManagerService;