Merge "Remove unnecessary @TestApi from framework-res" into main (1976f4a1) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+0 −44

Original line number	Diff line number	Diff line
		@@ -3,48 +3,23 @@ package android {

		public static final class Manifest.permission {
		field public static final String ACCESSIBILITY_MOTION_EVENT_OBSERVING = "android.permission.ACCESSIBILITY_MOTION_EVENT_OBSERVING";
		field public static final String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS";
		field public static final String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";
		field public static final String ADJUST_RUNTIME_PERMISSIONS_POLICY = "android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY";
		field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS";
		field public static final String BACKGROUND_CAMERA = "android.permission.BACKGROUND_CAMERA";
		field public static final String BIND_CELL_BROADCAST_SERVICE = "android.permission.BIND_CELL_BROADCAST_SERVICE";
		field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";
		field public static final String BROADCAST_CLOSE_SYSTEM_DIALOGS = "android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS";
		field public static final String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE";
		field public static final String CLEAR_APP_USER_DATA = "android.permission.CLEAR_APP_USER_DATA";
		field public static final String CLEAR_FREEZE_PERIOD = "android.permission.CLEAR_FREEZE_PERIOD";
		field public static final String CONFIGURE_DISPLAY_BRIGHTNESS = "android.permission.CONFIGURE_DISPLAY_BRIGHTNESS";
		field public static final String CONTROL_DEVICE_LIGHTS = "android.permission.CONTROL_DEVICE_LIGHTS";
		field public static final String CONTROL_DEVICE_STATE = "android.permission.CONTROL_DEVICE_STATE";
		field public static final String DELETE_STAGED_HEALTH_CONNECT_REMOTE_DATA = "android.permission.DELETE_STAGED_HEALTH_CONNECT_REMOTE_DATA";
		field public static final String FORCE_DEVICE_POLICY_MANAGER_LOGS = "android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS";
		field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";
		field public static final String GRANT_RUNTIME_PERMISSIONS = "android.permission.GRANT_RUNTIME_PERMISSIONS";
		field public static final String INSTALL_TEST_ONLY_PACKAGE = "android.permission.INSTALL_TEST_ONLY_PACKAGE";
		field public static final String KEEP_UNINSTALLED_PACKAGES = "android.permission.KEEP_UNINSTALLED_PACKAGES";
		field public static final String MAKE_UID_VISIBLE = "android.permission.MAKE_UID_VISIBLE";
		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 public static final String MANAGE_APP_OPS_MODES = "android.permission.MANAGE_APP_OPS_MODES";
		field public static final String MANAGE_CRATES = "android.permission.MANAGE_CRATES";
		field public static final String MANAGE_NOTIFICATION_LISTENERS = "android.permission.MANAGE_NOTIFICATION_LISTENERS";
		field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
		field public static final String MANAGE_TOAST_RATE_LIMITING = "android.permission.MANAGE_TOAST_RATE_LIMITING";
		field public static final String MODIFY_HDR_CONVERSION_MODE = "android.permission.MODIFY_HDR_CONVERSION_MODE";
		field public static final String MODIFY_REFRESH_RATE_SWITCHING_TYPE = "android.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE";
		field public static final String MODIFY_USER_PREFERRED_DISPLAY_MODE = "android.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE";
		field public static final String NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS";
		field public static final String NETWORK_STACK = "android.permission.NETWORK_STACK";
		field public static final String OVERRIDE_DISPLAY_MODE_REQUESTS = "android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS";
		field public static final String QUERY_AUDIO_STATE = "android.permission.QUERY_AUDIO_STATE";
		field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
		field public static final String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE";
		field public static final String READ_WRITE_SYNC_DISABLED_MODE_CONFIG = "android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG";
		field public static final String RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO";
		field @FlaggedApi("android.permission.flags.sensitive_notification_app_protection") public static final String RECORD_SENSITIVE_CONTENT = "android.permission.RECORD_SENSITIVE_CONTENT";
		field public static final String REMAP_MODIFIER_KEYS = "android.permission.REMAP_MODIFIER_KEYS";
		field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";
		field public static final String REQUEST_UNIQUE_ID_ATTESTATION = "android.permission.REQUEST_UNIQUE_ID_ATTESTATION";
		field public static final String RESERVED_FOR_TESTING_SIGNATURE = "android.permission.RESERVED_FOR_TESTING_SIGNATURE";
		field public static final String RESET_APP_ERRORS = "android.permission.RESET_APP_ERRORS";
		@@ -53,19 +28,9 @@ package android {
		field public static final String SET_GAME_SERVICE = "android.permission.SET_GAME_SERVICE";
		field public static final String SET_KEYBOARD_LAYOUT = "android.permission.SET_KEYBOARD_LAYOUT";
		field public static final String START_ACTIVITIES_FROM_SDK_SANDBOX = "android.permission.START_ACTIVITIES_FROM_SDK_SANDBOX";
		field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS";
		field public static final String TEST_BIOMETRIC = "android.permission.TEST_BIOMETRIC";
		field public static final String TEST_INPUT_METHOD = "android.permission.TEST_INPUT_METHOD";
		field public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS";
		field public static final String UPGRADE_RUNTIME_PERMISSIONS = "android.permission.UPGRADE_RUNTIME_PERMISSIONS";
		field public static final String WRITE_ALLOWLISTED_DEVICE_CONFIG = "android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG";
		field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";
		field @Deprecated public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";
		field public static final String WRITE_OBB = "android.permission.WRITE_OBB";
		}

		public static final class Manifest.permission_group {
		field public static final String UNDEFINED = "android.permission-group.UNDEFINED";
		}

		public static final class R.attr {
		@@ -79,15 +44,6 @@ package android {
		field public static final int config_remoteInsetsControllerControlsSystemBars = 17891334; // 0x1110006
		}

		public static final class R.string {
		field public static final int config_defaultAssistant = 17039393; // 0x1040021
		field public static final int config_defaultDialer = 17039395; // 0x1040023
		field public static final int config_systemAutomotiveCalendarSyncManager = 17039423; // 0x104003f
		field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028
		field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029
		field public static final int config_systemGallery = 17039399; // 0x1040027
		}

		}

		package android.accessibilityservice {

core/res/AndroidManifest.xml

+31 −35

Original line number	Diff line number	Diff line
		@@ -869,7 +869,6 @@
		<!-- Grouping for platform runtime permissions is not accessible to apps
		@hide
		@SystemApi
		@TestApi
		-->
		<permission-group android:name="android.permission-group.UNDEFINED"
		android:priority="100" />
		@@ -1059,7 +1058,7 @@
		android:permissionFlags="hardRestricted"
		android:protectionLevel="dangerous" />

		<!-- @SystemApi @TestApi Allows an application to forward cell broadcast messages to the cell
		<!-- @SystemApi Allows an application to forward cell broadcast messages to the cell
		broadcast module. This is required in order to bind to the cell broadcast service, and
		ensures that only the system can forward messages to it.

		@@ -1071,7 +1070,7 @@
		android:description="@string/permdesc_bindCellBroadcastService"
		android:protectionLevel="signature" />

		<!-- @SystemApi @TestApi Allows an application to read previously received cell broadcast
		<!-- @SystemApi Allows an application to read previously received cell broadcast
		messages and to register a content observer to get notifications when
		a cell broadcast has been received and added to the database. For
		emergency alerts, the database is updated immediately after the
		@@ -1348,7 +1347,7 @@
		android:description="@string/permdesc_mediaLocation"
		android:protectionLevel="dangerous" />

		<!-- @hide @SystemApi @TestApi
		<!-- @hide @SystemApi
		Allows an application to modify OBB files visible to other apps. -->
		<permission android:name="android.permission.WRITE_OBB"
		android:protectionLevel="signature\|privileged" />
		@@ -1694,7 +1693,7 @@
		android:backgroundPermission="android.permission.RECORD_BACKGROUND_AUDIO"
		android:protectionLevel="dangerous\|instant" />

		<!-- @SystemApi @TestApi Allows an application to record audio while in the background.
		<!-- @SystemApi Allows an application to record audio while in the background.
		This permission is not intended to be held by apps.
		<p>Protection level: internal
		@hide -->
		@@ -1786,7 +1785,7 @@
		android:description="@string/permgroupdesc_nearby_devices"
		android:priority="750" />

		<!-- @SystemApi @TestApi Required to be able to access the camera device in the background.
		<!-- @SystemApi Required to be able to access the camera device in the background.
		This permission is not intended to be held by apps.
		<p>Protection level: internal
		@hide -->
		@@ -2322,7 +2321,7 @@

		<!-- Allows network stack services (Connectivity and Wifi) to coordinate
		<p>Not for use by third-party or privileged applications.
		@SystemApi @TestApi
		@SystemApi
		@hide This should only be used by Connectivity and Wifi Services.
		-->
		<permission android:name="android.permission.NETWORK_STACK"
		@@ -2357,7 +2356,7 @@

		<!-- Allows Settings and SystemUI to call methods in Networking services
		<p>Not for use by third-party or privileged applications.
		@SystemApi @TestApi
		@SystemApi
		@hide This should only be used by Settings and SystemUI.
		-->
		<permission android:name="android.permission.NETWORK_SETTINGS"
		@@ -2555,7 +2554,7 @@
		android:protectionLevel="dangerous"
		android:featureFlag="android.permission.flags.ranging_permission_enabled"/>

		<!-- @SystemApi @TestApi Allows an application to suspend other apps, which will prevent the
		<!-- @SystemApi Allows an application to suspend other apps, which will prevent the
		user from using them until they are unsuspended.
		@hide
		-->
		@@ -3092,7 +3091,7 @@
		<permission android:name="android.permission.READ_PRECISE_PHONE_STATE"
		android:protectionLevel="signature\|privileged" />

		<!-- @SystemApi @TestApi Allows read access to privileged phone state.
		<!-- @SystemApi Allows read access to privileged phone state.
		@hide Used internally. -->
		<permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
		android:protectionLevel="signature\|privileged\|role" />
		@@ -3356,7 +3355,7 @@
		<!-- ================================== -->
		<eat-comment />

		<!-- @SystemApi @TestApi Allows an application to write to internal media storage
		<!-- @SystemApi Allows an application to write to internal media storage
		@deprecated This permission is no longer honored in the system and no longer adds
		the media_rw gid as a supplementary gid to the holder. Use the
		android.permission.MANAGE_EXTERNAL_STORAGE instead.
		@@ -4402,20 +4401,20 @@
		android:description="@string/permdesc_reorderTasks"
		android:protectionLevel="normal" />

		<!-- @SystemApi @TestApi @hide Allows an application to change to remove/kill tasks -->
		<!-- @SystemApi @hide Allows an application to change to remove/kill tasks -->
		<permission android:name="android.permission.REMOVE_TASKS"
		android:protectionLevel="signature\|recents\|role" />

		<!-- @deprecated Use MANAGE_ACTIVITY_TASKS instead.
		@SystemApi @TestApi @hide Allows an application to create/manage/remove stacks -->
		@SystemApi @hide Allows an application to create/manage/remove stacks -->
		<permission android:name="android.permission.MANAGE_ACTIVITY_STACKS"
		android:protectionLevel="signature" />

		<!-- @SystemApi @TestApi @hide Allows an application to create/manage/remove tasks -->
		<!-- @SystemApi @hide Allows an application to create/manage/remove tasks -->
		<permission android:name="android.permission.MANAGE_ACTIVITY_TASKS"
		android:protectionLevel="signature\|recents" />

		<!-- @SystemApi @TestApi @hide Allows an application to embed other activities -->
		<!-- @SystemApi @hide Allows an application to embed other activities -->
		<permission android:name="android.permission.ACTIVITY_EMBEDDING"
		android:protectionLevel="signature\|privileged" />

		@@ -4936,17 +4935,17 @@
		<permission android:name="android.permission.WRITE_GSERVICES"
		android:protectionLevel="signature\|privileged" />

		<!-- @SystemApi @TestApi @hide Allows an application to modify config settings.
		<!-- @SystemApi @hide Allows an application to modify config settings.
		<p>Not for use by third-party applications. -->
		<permission android:name="android.permission.WRITE_DEVICE_CONFIG"
		android:protectionLevel="signature\|verifier\|configurator"/>

		<!-- @SystemApi @TestApi @hide Allows an application to modify only allowlisted settings.
		<!-- @SystemApi @hide Allows an application to modify only allowlisted settings.
		<p>Not for use by third-party applications. -->
		<permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG"
		android:protectionLevel="signature\|verifier\|configurator"/>

		<!-- @SystemApi @TestApi @hide Allows an application to read/write sync disabled mode config.
		<!-- @SystemApi @hide Allows an application to read/write sync disabled mode config.
		<p>Not for use by third-party applications. -->
		<permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG"
		android:protectionLevel="signature\|verifier\|configurator"/>
		@@ -4972,7 +4971,7 @@
		<permission android:name="android.permission.MONITOR_DEVICE_CONFIG_ACCESS"
		android:protectionLevel="signature"/>

		<!-- @SystemApi @TestApi Allows an application to call
		<!-- @SystemApi Allows an application to call
		{@link android.app.ActivityManager#forceStopPackage}.
		@hide -->
		<permission android:name="android.permission.FORCE_STOP_PACKAGES"
		@@ -5347,7 +5346,7 @@
		<permission android:name="android.permission.BIND_TRACE_REPORT_SERVICE"
		android:protectionLevel="signature" />

		<!-- @hide @SystemApi @TestApi
		<!-- @hide @SystemApi
		Allow an application to approve incident and bug reports to be
		shared off-device. There can be only one application installed on the
		device with this permission, and since this is a privileged permission, it
		@@ -6481,7 +6480,7 @@
		<permission android:name="com.android.permission.USE_SYSTEM_DATA_LOADERS"
		android:protectionLevel="signature" />

		<!-- @SystemApi @TestApi Allows an application to clear user data.
		<!-- @SystemApi Allows an application to clear user data.
		<p>Not for use by third-party applications
		@hide
		-->
		@@ -6559,7 +6558,7 @@
		<permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"
		android:protectionLevel="signature\|privileged\|role" />

		<!-- @SystemApi @TestApi iAllows an application to grant specific permissions.
		<!-- @SystemApi iAllows an application to grant specific permissions.
		@hide -->
		<permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS"
		android:protectionLevel="signature\|installer\|verifier" />
		@@ -6599,12 +6598,12 @@
		<permission android:name="android.permission.RESTORE_RUNTIME_PERMISSIONS"
		android:protectionLevel="signature" />

		<!-- @SystemApi @TestApi Allows an application to change policy_fixed permissions.
		<!-- @SystemApi Allows an application to change policy_fixed permissions.
		@hide -->
		<permission android:name="android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY"
		android:protectionLevel="signature\|installer" />

		<!-- @SystemApi @TestApi Allows an application to upgrade runtime permissions.
		<!-- @SystemApi Allows an application to upgrade runtime permissions.
		@hide -->
		<permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS"
		android:protectionLevel="signature" />
		@@ -6805,8 +6804,7 @@

		<!-- Allows an application to control the lights on the device.
		@hide
		@SystemApi
		@TestApi -->
		@SystemApi -->
		<permission android:name="android.permission.CONTROL_DEVICE_LIGHTS"
		android:protectionLevel="signature\|privileged" />

		@@ -6826,8 +6824,7 @@
		<!-- Allows an application to collect usage information about brightness slider changes.
		<p>Not for use by third-party applications.</p>
		@hide
		@SystemApi
		@TestApi -->
		@SystemApi -->
		<permission android:name="android.permission.BRIGHTNESS_SLIDER_USAGE"
		android:protectionLevel="signature\|privileged\|development" />

		@@ -6840,8 +6837,7 @@

		<!-- Allows an application to modify the display brightness configuration
		@hide
		@SystemApi
		@TestApi -->
		@SystemApi -->
		<permission android:name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"
		android:protectionLevel="signature\|privileged\|development" />

		@@ -7135,7 +7131,7 @@
		<permission android:name="android.permission.FACTORY_TEST"
		android:protectionLevel="signature" />

		<!-- @hide @TestApi @SystemApi Allows an application to broadcast the intent {@link
		<!-- @hide @SystemApi Allows an application to broadcast the intent {@link
		android.content.Intent#ACTION_CLOSE_SYSTEM_DIALOGS}.
		<p>Not for use by third-party applications.
		-->
		@@ -7241,7 +7237,7 @@
		<permission android:name="android.permission.OBSERVE_APP_USAGE"
		android:protectionLevel="signature\|privileged\|role" />

		<!-- @hide @TestApi @SystemApi Allows an application to change the app idle state of an app.
		<!-- @hide @SystemApi Allows an application to change the app idle state of an app.
		<p>Not for use by third-party applications. -->
		<permission android:name="android.permission.CHANGE_APP_IDLE_STATE"
		android:protectionLevel="signature\|privileged" />
		@@ -7499,7 +7495,7 @@
		<permission android:name="android.permission.PACKAGE_ROLLBACK_AGENT"
		android:protectionLevel="signature" />

		<!-- @SystemApi @TestApi @hide Allows managing apk level rollbacks. -->
		<!-- @SystemApi @hide Allows managing apk level rollbacks. -->
		<permission android:name="android.permission.MANAGE_ROLLBACKS"
		android:protectionLevel="signature\|privileged" />

		@@ -7571,7 +7567,7 @@
		<permission android:name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE"
		android:protectionLevel="signature\|privileged\|role" />

		<!-- @SystemApi @TestApi Allows an application to read the current set of notifications, including
		<!-- @SystemApi Allows an application to read the current set of notifications, including
		any metadata and intents attached.
		@hide -->
		<permission android:name="android.permission.ACCESS_NOTIFICATIONS"
		@@ -7600,7 +7596,7 @@
		android:protectionLevel="signature\|installer"
		android:featureFlag="android.companion.enable_medical_profile"/>

		<!-- @SystemApi @TestApi Allows adding/removing enabled notification listener components.
		<!-- @SystemApi Allows adding/removing enabled notification listener components.
		@hide -->
		<permission android:name="android.permission.MANAGE_NOTIFICATION_LISTENERS"
		android:protectionLevel="signature\|installer" />

core/res/res/values/public-final.xml

+7 −7

Original line number	Diff line number	Diff line
		@@ -2955,11 +2955,11 @@
		<public type="string" name="config_feedbackIntentExtraKey" id="0x0104001f" />
		<!-- @hide @SystemApi -->
		<public type="string" name="config_feedbackIntentNameKey" id="0x01040020" />
		<!-- @hide @SystemApi @TestApi -->
		<!-- @hide @SystemApi -->
		<public type="string" name="config_defaultAssistant" id="0x01040021" />
		<!-- @hide @SystemApi -->
		<public type="string" name="config_defaultBrowser" id="0x01040022" />
		<!-- @hide @SystemApi @TestApi -->
		<!-- @hide @SystemApi -->
		<public type="string" name="config_defaultDialer" id="0x01040023" />
		<!-- @hide @SystemApi -->
		<public type="string" name="config_defaultSms" id="0x01040024" />
		@@ -3009,7 +3009,7 @@
		<public type="string" name="config_defaultCallRedirection" id="0x01040025" />
		<!-- @hide @SystemApi -->
		<public type="string" name="config_defaultCallScreening" id="0x01040026" />
		<!-- @hide @SystemApi @TestApi -->
		<!-- @hide @SystemApi -->
		<public type="string" name="config_systemGallery" id="0x01040027" />

		<public type="id" name="accessibilityActionPressAndHold" id="0x0102004a" />
		@@ -3160,9 +3160,9 @@
		<public type="dimen" name="system_app_widget_background_radius" id="0x01050008" />
		<public type="dimen" name="system_app_widget_inner_radius" id="0x01050009" />

		<!-- @hide @SystemApi @TestApi -->
		<!-- @hide @SystemApi -->
		<public type="string" name="config_systemAutomotiveCluster" id="0x01040028" />
		<!-- @hide @SystemApi @TestApi -->
		<!-- @hide @SystemApi -->
		<public type="string" name="config_systemAutomotiveProjection" id="0x01040029" />
		<!-- @hide @SystemApi -->
		<public type="string" name="config_systemShell" id="0x0104002a" />
		@@ -3345,7 +3345,7 @@
		<public name="config_devicePolicyManagement" />
		<!-- @hide @SystemApi -->
		<public name="config_systemAppProtectionService" />
		<!-- @hide @SystemApi @TestApi -->
		<!-- @hide @SystemApi -->
		<public name="config_systemAutomotiveCalendarSyncManager" />
		<!-- @hide @SystemApi -->
		<public name="config_defaultAutomotiveNavigation" />
		@@ -3363,7 +3363,7 @@
		<public type="string" name="config_devicePolicyManagement" id="0x0104003d" />
		<!-- @hide @SystemApi -->
		<public type="string" name="config_systemAppProtectionService" id="0x0104003e" />
		<!-- @hide @SystemApi @TestApi -->
		<!-- @hide @SystemApi -->
		<public type="string" name="config_systemAutomotiveCalendarSyncManager" id="0x0104003f" />
		<!-- @hide @SystemApi -->
		<public type="string" name="config_defaultAutomotiveNavigation" id="0x01040040" />