diff options
| author | 2020-11-13 17:26:33 +0900 | |
|---|---|---|
| committer | 2020-11-16 19:43:52 +0900 | |
| commit | ea2e23f84b91f3b76cd841c23af0c564ac3c7ca2 (patch) | |
| tree | 051607327820f728d6bad66d91ca112defe1c234 | |
| parent | 70072fd16fb0c4a893bf69836a80f1a673f5286e (diff) | |
binder: fix google-build-using-namespace
Bug: 162909698
Test: m libbinder
Change-Id: I821c42c32b38e38dbbca347f6a99bcc24898df7d
| -rw-r--r-- | libs/binder/Android.bp | 1 | ||||
| -rw-r--r-- | libs/binder/PersistableBundle.cpp | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index dfeefe983a..e31add2a1f 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -180,7 +180,6 @@ cc_library { ], tidy_checks_as_errors: [ "*", - "-google-build-using-namespace", "-google-default-arguments", "-google-runtime-int", ], diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp index 97a6c94635..c807cfe89a 100644 --- a/libs/binder/PersistableBundle.cpp +++ b/libs/binder/PersistableBundle.cpp @@ -34,10 +34,22 @@ using android::Parcel; using android::sp; using android::status_t; using android::UNEXPECTED_NULL; + +using android::binder::VAL_BOOLEAN; +using android::binder::VAL_INTEGER; +using android::binder::VAL_LONG; +using android::binder::VAL_DOUBLE; +using android::binder::VAL_STRING; +using android::binder::VAL_BOOLEANARRAY; +using android::binder::VAL_INTARRAY; +using android::binder::VAL_LONGARRAY; +using android::binder::VAL_DOUBLEARRAY; +using android::binder::VAL_STRINGARRAY; +using android::binder::VAL_PERSISTABLEBUNDLE; + using std::map; using std::set; using std::vector; -using namespace ::android::binder; enum { // Keep them in sync with BUNDLE_MAGIC* in frameworks/base/core/java/android/os/BaseBundle.java. |