diff options
| author | Brad Ebinger <breadley@google.com> | 2021-02-26 20:54:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 20:54:10 +0000 |
| commit | f92683b7d10916ef7c699a23a712ef51fcc87d3b (patch) | |
| tree | b7be2f5e6498ca21eb27153d315a4f1bd540887e /core/res | |
| parent | ac811c4025c0d33283d7cbc29bc4ccaf1c3552c8 (diff) | |
| parent | 44d6bdc3326dce80294ede5eda3f4cb305c55ad0 (diff) | |
Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" am: 44d6bdc332
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555055
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I62579792679ebb079d9fd2f97720a66d1d5aec3f
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 91c1548bfcc2..8ed7a5c2611e 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1271,11 +1271,13 @@ android:protectionLevel="dangerous|instant" /> <!-- ====================================================================== --> - <!-- Permissions for accessing the UCE Service --> + <!-- Permissions for accessing the vendor UCE Service --> <!-- ====================================================================== --> <!-- @hide Allows an application to Access UCE-Presence. <p>Protection level: signature|privileged + @deprecated Framework should no longer use this permission to access the vendor UCE service + using AIDL, it is instead implemented by RcsCapabilityExchangeImplBase --> <permission android:name="android.permission.ACCESS_UCE_PRESENCE_SERVICE" android:permissionGroup="android.permission-group.PHONE" @@ -1283,6 +1285,8 @@ <!-- @hide Allows an application to Access UCE-OPTIONS. <p>Protection level: signature|privileged + @deprecated Framework should no longer use this permission to access the vendor UCE service + using AIDL, it is instead implemented by RcsCapabilityExchangeImplBase --> <permission android:name="android.permission.ACCESS_UCE_OPTIONS_SERVICE" android:permissionGroup="android.permission-group.PHONE" @@ -2367,6 +2371,13 @@ <permission android:name="android.permission.BIND_GBA_SERVICE" android:protectionLevel="signature" /> + <!-- Required for an Application to access APIs related to RCS User Capability Exchange. + <p>Protection level: signature|privileged + @SystemApi + @hide --> + <permission android:name="android.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE" + android:protectionLevel="signature|privileged" /> + <!-- ================================== --> <!-- Permissions for sdcard interaction --> <!-- ================================== --> |