Merge "Remove appPredictor from android:protectionLevel because we already have role" into sc-dev

This commit is contained in:
Victoria Lestari
2021-04-21 17:47:45 +00:00
committed by Android (Google) Code Review

View File

@@ -2842,11 +2842,11 @@
The app can check whether it has this authorization by calling
{@link android.provider.Settings#canDrawOverlays
Settings.canDrawOverlays()}.
<p>Protection level: signature|setup|appop|installer|appPredictor|pre23|development -->
<p>Protection level: signature|setup|appop|installer|pre23|development -->
<permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
android:label="@string/permlab_systemAlertWindow"
android:description="@string/permdesc_systemAlertWindow"
android:protectionLevel="signature|setup|appop|installer|appPredictor|pre23|development" />
android:protectionLevel="signature|setup|appop|installer|pre23|development" />
<!-- @SystemApi @hide Allows an application to create windows using the type
{@link android.view.WindowManager.LayoutParams#TYPE_APPLICATION_OVERLAY},
@@ -5418,7 +5418,7 @@
<!-- @SystemApi Allows an application to manage the app predictions service.
@hide <p>Not for use by third-party applications.</p> -->
<permission android:name="android.permission.MANAGE_APP_PREDICTIONS"
android:protectionLevel="signature|appPredictor|role" />
android:protectionLevel="signature|role" />
<!-- @SystemApi Allows an application to manage the search ui service.
@hide <p>Not for use by third-party applications.</p> -->
@@ -5453,12 +5453,12 @@
<!-- @SystemApi Allows to access all app shortcuts.
@hide -->
<permission android:name="android.permission.ACCESS_SHORTCUTS"
android:protectionLevel="signature|appPredictor|role" />
android:protectionLevel="signature|role" />
<!-- @SystemApi Allows unlimited calls to shortcut mutation APIs.
@hide -->
<permission android:name="android.permission.UNLIMITED_SHORTCUTS_API_CALLS"
android:protectionLevel="signature|appPredictor|role" />
android:protectionLevel="signature|role" />
<!-- @SystemApi Allows an application to read the runtime profiles of other apps.
@hide <p>Not for use by third-party applications. -->
@@ -5666,7 +5666,7 @@
<!-- @hide @SystemApi Allows an application to access locusId events in the usage stats. -->
<permission android:name="android.permission.ACCESS_LOCUS_ID_USAGE_STATS"
android:protectionLevel="signature|appPredictor" />
android:protectionLevel="signature|role" />
<!-- @hide @SystemApi Allows an application to manage app hibernation state. -->
<permission android:name="android.permission.MANAGE_APP_HIBERNATION"
@@ -5720,7 +5720,7 @@
Conversation.
TODO(b/180412052): STOPSHIP: Define a role so it can be granted to Shell and AiAi. -->
<permission android:name="android.permission.READ_PEOPLE_DATA"
android:protectionLevel="signature|appPredictor|recents"/>
android:protectionLevel="signature|recents|role"/>
<!-- @hide @SystemApi Allows a logical component within an application to
temporarily renounce a set of otherwise granted permissions. -->