Merge "Add MANAGE_SAFETY_CENTER permission."
This commit is contained in:
committed by
Android (Google) Code Review
commit
398ed934da
@@ -165,6 +165,7 @@ package android {
|
||||
field public static final String MANAGE_ROLE_HOLDERS = "android.permission.MANAGE_ROLE_HOLDERS";
|
||||
field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
|
||||
field public static final String MANAGE_ROTATION_RESOLVER = "android.permission.MANAGE_ROTATION_RESOLVER";
|
||||
field public static final String MANAGE_SAFETY_CENTER = "android.permission.MANAGE_SAFETY_CENTER";
|
||||
field public static final String MANAGE_SEARCH_UI = "android.permission.MANAGE_SEARCH_UI";
|
||||
field public static final String MANAGE_SENSOR_PRIVACY = "android.permission.MANAGE_SENSOR_PRIVACY";
|
||||
field public static final String MANAGE_SMARTSPACE = "android.permission.MANAGE_SMARTSPACE";
|
||||
|
||||
@@ -6100,7 +6100,7 @@
|
||||
@hide -->
|
||||
<permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES"
|
||||
android:protectionLevel="signature|role" />
|
||||
|
||||
|
||||
<!-- @SystemApi Allows an app to read whether SafetyCenter is enabled/disabled.
|
||||
<p>Protection level: signature|privileged
|
||||
@hide
|
||||
@@ -6108,6 +6108,14 @@
|
||||
<permission android:name="android.permission.READ_SAFETY_CENTER_STATUS"
|
||||
android:protectionLevel="signature|privileged" />
|
||||
|
||||
<!-- @SystemApi Required to access the safety center internal APIs using the
|
||||
{@link android.safetycenter.SafetyCenterManager}.
|
||||
<p>Protection level: internal|installer|role
|
||||
@hide
|
||||
-->
|
||||
<permission android:name="android.permission.MANAGE_SAFETY_CENTER"
|
||||
android:protectionLevel="internal|installer|role" />
|
||||
|
||||
<!-- Attribution for Geofencing service. -->
|
||||
<attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>
|
||||
<!-- Attribution for Country Detector. -->
|
||||
|
||||
@@ -519,9 +519,8 @@ applications that come with the platform
|
||||
<permission name="android.permission.MANAGE_VOICE_KEYPHRASES" />
|
||||
<!-- Permission required for ATS test - CarDevicePolicyManagerTest -->
|
||||
<permission name="android.permission.LOCK_DEVICE" />
|
||||
<!-- Permission required for CTS test - CtsSafetyCenterTestCases -->
|
||||
<!-- Permissions required for CTS test - CtsSafetyCenterTestCases -->
|
||||
<permission name="android.permission.SEND_SAFETY_CENTER_UPDATE" />
|
||||
<!-- Permission required for CTS test - CtsSafetyCenterTestCases -->
|
||||
<permission name="android.permission.READ_SAFETY_CENTER_STATUS" />
|
||||
</privapp-permissions>
|
||||
|
||||
|
||||
@@ -608,11 +608,11 @@
|
||||
<!-- Permission required for ATS test - CarDevicePolicyManagerTest -->
|
||||
<uses-permission android:name="android.permission.LOCK_DEVICE" />
|
||||
|
||||
<!-- Permission required for CTS test - CtsSafetyCenterTestCases -->
|
||||
<!-- Permissions required for CTS test - CtsSafetyCenterTestCases -->
|
||||
<uses-permission android:name="android.permission.SEND_SAFETY_CENTER_UPDATE" />
|
||||
|
||||
<!-- Permission required for CTS test - CtsSafetyCenterTestCases -->
|
||||
<uses-permission android:name="android.permission.READ_SAFETY_CENTER_STATUS" />
|
||||
<uses-permission android:name="android.permission.MANAGE_SAFETY_CENTER" />
|
||||
|
||||
|
||||
<!-- Permission required for CTS test - Notification test suite -->
|
||||
<uses-permission android:name="android.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL" />
|
||||
|
||||
Reference in New Issue
Block a user