LineageOS/android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix misc-macro-parentheses warnings."

Browse Source 
am: 64d4f64af0

* commit '64d4f64af09504c60929cf4907c1690688e1d435':
  Fix misc-macro-parentheses warnings.

Change-Id: I040338982d91ad12bef27e64807da69caa98e886
This commit is contained in:
Chih-Hung Hsieh
2016-05-19 19:10:03 +00:00
committed by android-build-merger
parent f89b497da8 64d4f64af0
commit 5405ce02c4
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drm/common/IDrmManagerService.cpp
View File

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

2
drm/common/ReadWriteUtils.cpp
View File

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

2
drm/drmserver/DrmManager.cpp
View File

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

2
drm/libdrmframework/DrmManagerClientImpl.cpp
View File

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