commit 63b0a64a95193190c75773e0770efba355f65331
author Steven Ng <stevenckng@google.com> Wed Dec 04 09:57:11 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 04 09:57:11 2019 +0000
tree dac429a7bd7f151047a502e6ed0437de5cd27a6a
parent f0a5b9a5a077d1c117c386a319a3899766348ee3
parent a3143b81d6323d6c5eabc1bfb8c0198120545691

Merge "Temporarily add wellbeing protection flag to use MANAGE_ROLE_HOLDERS in RVC"

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 09866a6..9dc2319 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3548,9 +3548,10 @@
         android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to manage the holders of a role.
-         @hide -->
+         @hide
+         STOPSHIP b/145526313: Remove wellbeing protection flag from MANAGE_ROLE_HOLDERS. -->
     <permission android:name="android.permission.MANAGE_ROLE_HOLDERS"
-                android:protectionLevel="signature|installer|telephony" />
+                android:protectionLevel="signature|installer|telephony|wellbeing" />
 
     <!-- @SystemApi Allows an application to observe role holder changes.
          @hide -->