diff options
-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. |