| commit | d56e0f86dc171367ab9c675a89cf44159f30c83c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Sep 22 03:50:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 22 03:50:52 2020 +0000 |
| tree | 9f4f1c7ea135f7566bea01d63bf9eb9fe1904d1a | |
| parent | 567942355e7c7a218e91bad93c3eb4a7b94e95a6 [diff] | |
| parent | 805bbc86fef9449340672737e5d2143a288538ce [diff] |
Merge "libbinder_ndk: APEX client is considered as platform" am: b3f953a7bf am: e8996bd9d0 am: 805bbc86fe Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1425364 Change-Id: I6687b51c7d75788c8eada8bf0819241ca7b1074d
diff --git a/libs/binder/ndk/include_cpp/android/binder_interface_utils.h b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h index f44ce0c..a4f4441 100644 --- a/libs/binder/ndk/include_cpp/android/binder_interface_utils.h +++ b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h
@@ -93,7 +93,7 @@ // // Use 'SharedRefBase::make<T>(...)' to make. SharedRefBase has implicit // ownership. Making this operator private to avoid double-ownership. -#if !defined(__ANDROID_API__) || __ANDROID_API__ >= 30 +#if !defined(__ANDROID_API__) || __ANDROID_API__ >= 30 || defined(__ANDROID_APEX__) private: #else [[deprecated("Prefer SharedRefBase::make<T>(...) if possible.")]]