Merge "[AAPM] Rename permission" into main (97b1de7f) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -193,6 +193,7 @@ package android {
		field public static final String MANAGE_ACCESSIBILITY = "android.permission.MANAGE_ACCESSIBILITY";
		field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
		field public static final String MANAGE_ACTIVITY_TASKS = "android.permission.MANAGE_ACTIVITY_TASKS";
		field @FlaggedApi("android.security.aapm_api") public static final String MANAGE_ADVANCED_PROTECTION_MODE = "android.permission.MANAGE_ADVANCED_PROTECTION_MODE";
		field public static final String MANAGE_APP_HIBERNATION = "android.permission.MANAGE_APP_HIBERNATION";
		field public static final String MANAGE_APP_OPS_RESTRICTIONS = "android.permission.MANAGE_APP_OPS_RESTRICTIONS";
		field public static final String MANAGE_APP_PREDICTIONS = "android.permission.MANAGE_APP_PREDICTIONS";
		@@ -375,7 +376,6 @@ package android {
		field public static final String SERIAL_PORT = "android.permission.SERIAL_PORT";
		field @FlaggedApi("android.security.fsverity_api") public static final String SETUP_FSVERITY = "android.permission.SETUP_FSVERITY";
		field public static final String SET_ACTIVITY_WATCHER = "android.permission.SET_ACTIVITY_WATCHER";
		field @FlaggedApi("android.security.aapm_api") public static final String SET_ADVANCED_PROTECTION_MODE = "android.permission.SET_ADVANCED_PROTECTION_MODE";
		field public static final String SET_CLIP_SOURCE = "android.permission.SET_CLIP_SOURCE";
		field public static final String SET_DEFAULT_ACCOUNT_FOR_CONTACTS = "android.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS";
		field public static final String SET_HARMFUL_APP_WARNINGS = "android.permission.SET_HARMFUL_APP_WARNINGS";
		@@ -12817,8 +12817,8 @@ package android.security.advancedprotection {

		@FlaggedApi("android.security.aapm_api") public final class AdvancedProtectionManager {
		method @NonNull public android.content.Intent createSupportIntent(@NonNull String, @Nullable String);
		method @NonNull @RequiresPermission(android.Manifest.permission.SET_ADVANCED_PROTECTION_MODE) public java.util.List<android.security.advancedprotection.AdvancedProtectionFeature> getAdvancedProtectionFeatures();
		method @RequiresPermission(android.Manifest.permission.SET_ADVANCED_PROTECTION_MODE) public void setAdvancedProtectionEnabled(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ADVANCED_PROTECTION_MODE) public java.util.List<android.security.advancedprotection.AdvancedProtectionFeature> getAdvancedProtectionFeatures();
		method @RequiresPermission(android.Manifest.permission.MANAGE_ADVANCED_PROTECTION_MODE) public void setAdvancedProtectionEnabled(boolean);
		field @FlaggedApi("android.security.aapm_api") public static final String ACTION_SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG = "android.security.advancedprotection.action.SHOW_ADVANCED_PROTECTION_SUPPORT_DIALOG";
		field public static final String EXTRA_SUPPORT_DIALOG_FEATURE = "android.security.advancedprotection.extra.SUPPORT_DIALOG_FEATURE";
		field public static final String EXTRA_SUPPORT_DIALOG_TYPE = "android.security.advancedprotection.extra.SUPPORT_DIALOG_TYPE";

core/java/android/security/advancedprotection/AdvancedProtectionManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ public final class AdvancedProtectionManager {
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.SET_ADVANCED_PROTECTION_MODE)
		@RequiresPermission(Manifest.permission.MANAGE_ADVANCED_PROTECTION_MODE)
		public void setAdvancedProtectionEnabled(boolean enabled) {
		try {
		mService.setAdvancedProtectionEnabled(enabled);
		@@ -297,7 +297,7 @@ public final class AdvancedProtectionManager {
		*/
		@SystemApi
		@NonNull
		@RequiresPermission(Manifest.permission.SET_ADVANCED_PROTECTION_MODE)
		@RequiresPermission(Manifest.permission.MANAGE_ADVANCED_PROTECTION_MODE)
		public List<AdvancedProtectionFeature> getAdvancedProtectionFeatures() {
		try {
		return mService.getAdvancedProtectionFeatures();

core/java/android/security/advancedprotection/IAdvancedProtectionService.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,8 @@ interface IAdvancedProtectionService {
		void registerAdvancedProtectionCallback(IAdvancedProtectionCallback callback);
		@EnforcePermission("QUERY_ADVANCED_PROTECTION_MODE")
		void unregisterAdvancedProtectionCallback(IAdvancedProtectionCallback callback);
		@EnforcePermission("SET_ADVANCED_PROTECTION_MODE")
		@EnforcePermission("MANAGE_ADVANCED_PROTECTION_MODE")
		void setAdvancedProtectionEnabled(boolean enabled);
		@EnforcePermission("SET_ADVANCED_PROTECTION_MODE")
		@EnforcePermission("MANAGE_ADVANCED_PROTECTION_MODE")
		List<AdvancedProtectionFeature> getAdvancedProtectionFeatures();
		}
		No newline at end of file

core/res/AndroidManifest.xml

+6 −5

Original line number	Diff line number	Diff line
		@@ -4201,18 +4201,19 @@
		android:protectionLevel="signature\|installer" />
		<uses-permission android:name="android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES" />

		<!-- Allows an application to toggle the device's advanced protection mode status.
		@FlaggedApi("android.security.aapm_api")
		<!-- Allows an application to modify the device's advanced protection mode status, and query
		the list of enabled features
		@FlaggedApi(android.security.Flags.FLAG_AAPM_API)
		@SystemApi
		@hide -->
		<permission android:name="android.permission.SET_ADVANCED_PROTECTION_MODE"
		<permission android:name="android.permission.MANAGE_ADVANCED_PROTECTION_MODE"
		android:protectionLevel="signature\|privileged"
		android:featureFlag="android.security.aapm_api"/>
		<uses-permission android:name="android.permission.SET_ADVANCED_PROTECTION_MODE"
		<uses-permission android:name="android.permission.MANAGE_ADVANCED_PROTECTION_MODE"
		android:featureFlag="android.security.aapm_api"/>

		<!-- Allows an application to query the device's advanced protection mode status.
		@FlaggedApi("android.security.aapm_api") -->
		@FlaggedApi(android.security.Flags.FLAG_AAPM_API) -->
		<permission android:name="android.permission.QUERY_ADVANCED_PROTECTION_MODE"
		android:protectionLevel="normal"
		android:featureFlag="android.security.aapm_api"/>

data/etc/privapp-permissions-platform.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -599,7 +599,7 @@ applications that come with the platform
		<!-- Permission required for CTS test - CtsAppTestCases -->
		<permission name="android.permission.KILL_UID" />
		<!-- Permission required for CTS test - AdvancedProtectionManagerTest -->
		<permission name="android.permission.SET_ADVANCED_PROTECTION_MODE" />
		<permission name="android.permission.MANAGE_ADVANCED_PROTECTION_MODE" />
		<permission name="android.permission.QUERY_ADVANCED_PROTECTION_MODE" />
		<!-- Permissions required for CTS test - SettingsPreferenceServiceClientTest -->
		<permission name="android.permission.READ_SYSTEM_PREFERENCES" />