| commit | 805bbc86fef9449340672737e5d2143a288538ce | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Sep 22 03:10:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 22 03:10:21 2020 +0000 |
| tree | 71c4b2a6752a31d51cfa9ed834354cba763cff8b | |
| parent | 58154ad99e6451ee20c233ef9b31c3c195fc0b3e [diff] | |
| parent | e8996bd9d0ab217035994b179f930ae7680c1f12 [diff] |
Merge "libbinder_ndk: APEX client is considered as platform" am: b3f953a7bf am: e8996bd9d0 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1425364 Change-Id: If750950fddba32b85d66f64b91ecacbd5a218857
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.")]]