Merge "Remove @TestApi from @SystemApi symbols" (d2d46376) · Commits · e / os / android_frameworks_base

apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.annotation.TestApi;
		import android.content.Context;

		import java.lang.annotation.Retention;
		@@ -35,7 +34,6 @@ import java.util.List;
		* @hide
		*/
		@SystemApi
		@TestApi
		@SystemService(Context.POWER_WHITELIST_MANAGER)
		public class PowerWhitelistManager {
		private final Context mContext;

api/test-current.txt

+0 −3224

File changed.

Preview size limit exceeded, changes collapsed.

api/test-removed.txt

+0 −9

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		package android.app.prediction {

		public static final class AppTarget.Builder {
		method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
		method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
		}

		}

core/java/android/app/ActivityManager.java

+7 −8

Original line number	Diff line number	Diff line
		@@ -3757,7 +3757,7 @@ public class ActivityManager {
		* running its code, {@link RunningAppProcessInfo#IMPORTANCE_GONE} is returned.
		* @hide
		*/
		@SystemApi @TestApi
		@SystemApi
		@RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)
		public @RunningAppProcessInfo.Importance int getPackageImportance(String packageName) {
		try {
		@@ -3777,7 +3777,7 @@ public class ActivityManager {
		* running its code, {@link RunningAppProcessInfo#IMPORTANCE_GONE} is returned.
		* @hide
		*/
		@SystemApi @TestApi
		@SystemApi
		@RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)
		public @RunningAppProcessInfo.Importance int getUidImportance(int uid) {
		try {
		@@ -3794,7 +3794,7 @@ public class ActivityManager {
		* {@link #addOnUidImportanceListener}.
		* @hide
		*/
		@SystemApi @TestApi
		@SystemApi
		public interface OnUidImportanceListener {
		/**
		* The importance if a given uid has changed. Will be one of the importance
		@@ -3825,7 +3825,7 @@ public class ActivityManager {
		* {@link android.Manifest.permission#PACKAGE_USAGE_STATS}.
		* @hide
		*/
		@SystemApi @TestApi
		@SystemApi
		@RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)
		public void addOnUidImportanceListener(OnUidImportanceListener listener,
		@RunningAppProcessInfo.Importance int importanceCutpoint) {
		@@ -3854,7 +3854,7 @@ public class ActivityManager {
		* @throws IllegalArgumentException If the listener is not registered.
		* @hide
		*/
		@SystemApi @TestApi
		@SystemApi
		@RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)
		public void removeOnUidImportanceListener(OnUidImportanceListener listener) {
		synchronized (this) {
		@@ -3996,7 +3996,7 @@ public class ActivityManager {
		* @see #forceStopPackageAsUser(String, int)
		* @hide
		*/
		@SystemApi @TestApi
		@SystemApi
		@RequiresPermission(Manifest.permission.FORCE_STOP_PACKAGES)
		public void forceStopPackage(String packageName) {
		forceStopPackageAsUser(packageName, mContext.getUserId());
		@@ -4335,7 +4335,6 @@ public class ActivityManager {
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(android.Manifest.permission.MANAGE_USERS)
		public boolean switchUser(@NonNull UserHandle user) {
		if (user == null) {
		@@ -4768,7 +4767,7 @@ public class ActivityManager {
		*
		* @hide
		*/
		@SystemApi @TestApi
		@SystemApi
		@RequiresPermission(Manifest.permission.FORCE_STOP_PACKAGES)
		public void killProcessesWhenImperceptible(@NonNull int[] pids, @NonNull String reason) {
		try {

core/java/android/app/AppOpsManager.java

+50 −82

Original line number	Diff line number	Diff line
		@@ -447,7 +447,6 @@ public class AppOpsManager {
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int UID_STATE_PERSISTENT = 100;

		@@ -456,7 +455,6 @@ public class AppOpsManager {
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int UID_STATE_TOP = 200;

		@@ -468,7 +466,6 @@ public class AppOpsManager {
		* @hide
		* @deprecated
		*/
		@TestApi
		@SystemApi
		@Deprecated
		public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300;
		@@ -478,7 +475,6 @@ public class AppOpsManager {
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int UID_STATE_FOREGROUND_SERVICE = 400;

		@@ -487,7 +483,6 @@ public class AppOpsManager {
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int UID_STATE_FOREGROUND = 500;

		@@ -503,7 +498,6 @@ public class AppOpsManager {
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int UID_STATE_BACKGROUND = 600;

		@@ -512,7 +506,6 @@ public class AppOpsManager {
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int UID_STATE_CACHED = 700;

		@@ -590,7 +583,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int OP_FLAG_SELF = 0x1;

		@@ -601,7 +593,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int OP_FLAG_TRUSTED_PROXY = 0x2;

		@@ -612,7 +603,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int OP_FLAG_UNTRUSTED_PROXY = 0x4;

		@@ -623,7 +613,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int OP_FLAG_TRUSTED_PROXIED = 0x8;

		@@ -634,7 +623,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int OP_FLAG_UNTRUSTED_PROXIED = 0x10;

		@@ -646,7 +634,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final int OP_FLAGS_ALL =
		OP_FLAG_SELF
		@@ -1143,7 +1130,7 @@ public class AppOpsManager {
		public static final String OPSTR_GET_USAGE_STATS
		= "android:get_usage_stats";
		/** Activate a VPN connection without user intervention. @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_ACTIVATE_VPN
		= "android:activate_vpn";
		/** Allows an application to read the user's contacts data. */
		@@ -1225,7 +1212,7 @@ public class AppOpsManager {
		public static final String OPSTR_WRITE_SETTINGS
		= "android:write_settings";
		/** @hide Get device accounts. */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_GET_ACCOUNTS
		= "android:get_accounts";
		public static final String OPSTR_READ_PHONE_NUMBERS
		@@ -1234,7 +1221,7 @@ public class AppOpsManager {
		public static final String OPSTR_PICTURE_IN_PICTURE
		= "android:picture_in_picture";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_INSTANT_APP_START_FOREGROUND
		= "android:instant_app_start_foreground";
		/** Answer incoming phone calls */
		@@ -1244,129 +1231,129 @@ public class AppOpsManager {
		* Accept call handover
		* @hide
		*/
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_ACCEPT_HANDOVER
		= "android:accept_handover";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_GPS = "android:gps";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_VIBRATE = "android:vibrate";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_WIFI_SCAN = "android:wifi_scan";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_POST_NOTIFICATION = "android:post_notification";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_NEIGHBORING_CELLS = "android:neighboring_cells";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_WRITE_SMS = "android:write_sms";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_RECEIVE_EMERGENCY_BROADCAST =
		"android:receive_emergency_broadcast";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_READ_ICC_SMS = "android:read_icc_sms";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_WRITE_ICC_SMS = "android:write_icc_sms";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_PLAY_AUDIO = "android:play_audio";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_READ_CLIPBOARD = "android:read_clipboard";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_WRITE_CLIPBOARD = "android:write_clipboard";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_TAKE_MEDIA_BUTTONS = "android:take_media_buttons";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_TAKE_AUDIO_FOCUS = "android:take_audio_focus";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_AUDIO_MASTER_VOLUME = "android:audio_master_volume";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_AUDIO_VOICE_VOLUME = "android:audio_voice_volume";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_AUDIO_RING_VOLUME = "android:audio_ring_volume";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_AUDIO_MEDIA_VOLUME = "android:audio_media_volume";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_AUDIO_ALARM_VOLUME = "android:audio_alarm_volume";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_AUDIO_NOTIFICATION_VOLUME =
		"android:audio_notification_volume";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_AUDIO_BLUETOOTH_VOLUME = "android:audio_bluetooth_volume";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_WAKE_LOCK = "android:wake_lock";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_MUTE_MICROPHONE = "android:mute_microphone";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_TOAST_WINDOW = "android:toast_window";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_PROJECT_MEDIA = "android:project_media";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_WRITE_WALLPAPER = "android:write_wallpaper";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_ASSIST_STRUCTURE = "android:assist_structure";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_TURN_SCREEN_ON = "android:turn_screen_on";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_RUN_IN_BACKGROUND = "android:run_in_background";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_AUDIO_ACCESSIBILITY_VOLUME =
		"android:audio_accessibility_volume";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_REQUEST_INSTALL_PACKAGES = "android:request_install_packages";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_RUN_ANY_IN_BACKGROUND = "android:run_any_in_background";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_CHANGE_WIFI_STATE = "android:change_wifi_state";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_REQUEST_DELETE_PACKAGES = "android:request_delete_packages";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_BIND_ACCESSIBILITY_SERVICE =
		"android:bind_accessibility_service";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_MANAGE_IPSEC_TUNNELS = "android:manage_ipsec_tunnels";
		/** @hide */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_START_FOREGROUND = "android:start_foreground";
		/** @hide */
		public static final String OPSTR_BLUETOOTH_SCAN = "android:bluetooth_scan";
		@@ -1382,25 +1369,25 @@ public class AppOpsManager {
		"android:sms_financial_transactions";

		/** @hide Read media of audio type. */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_READ_MEDIA_AUDIO = "android:read_media_audio";
		/** @hide Write media of audio type. */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_WRITE_MEDIA_AUDIO = "android:write_media_audio";
		/** @hide Read media of video type. */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_READ_MEDIA_VIDEO = "android:read_media_video";
		/** @hide Write media of video type. */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_WRITE_MEDIA_VIDEO = "android:write_media_video";
		/** @hide Read media of image type. */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_READ_MEDIA_IMAGES = "android:read_media_images";
		/** @hide Write media of image type. */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_WRITE_MEDIA_IMAGES = "android:write_media_images";
		/** @hide Has a legacy (non-isolated) view of storage. */
		@SystemApi @TestApi
		@SystemApi
		public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage";
		/** @hide Read location metadata from media */
		public static final String OPSTR_ACCESS_MEDIA_LOCATION = "android:access_media_location";
		@@ -1414,7 +1401,6 @@ public class AppOpsManager {
		public static final String OPSTR_QUERY_ALL_PACKAGES = "android:query_all_packages";
		/** @hide Access all external storage */
		@SystemApi
		@TestApi
		public static final String OPSTR_MANAGE_EXTERNAL_STORAGE =
		"android:manage_external_storage";

		@@ -2593,7 +2579,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static int opToDefaultMode(@NonNull String appOp) {
		return opToDefaultMode(strOpToOp(appOp));
		@@ -2683,7 +2668,6 @@ public class AppOpsManager {
		* Class holding all of the operation information associated with an app.
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final class PackageOps implements Parcelable {
		private final String mPackageName;
		@@ -2762,7 +2746,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		// @DataClass(genHiddenConstructor = true, genHiddenCopyConstructor = true)
		// genHiddenCopyConstructor does not work for @hide @SystemApi classes
		@@ -3130,7 +3113,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		@Immutable
		// @DataClass(genHiddenConstructor = true) codegen verifier is broken
		@@ -3704,7 +3686,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@Immutable
		@SystemApi
		// @DataClass(genHiddenConstructor = true) codegen verifier is broken
		@@ -4382,7 +4363,6 @@ public class AppOpsManager {
		* @hide
		*/
		@Immutable
		@TestApi
		@SystemApi
		public static final class HistoricalOpsRequest {
		private final int mUid;
		@@ -4413,7 +4393,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final class Builder {
		private int mUid = Process.INVALID_UID;
		@@ -4551,7 +4530,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final class HistoricalOps implements Parcelable {
		private long mBeginTimeMillis;
		@@ -4988,7 +4966,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final class HistoricalUidOps implements Parcelable {
		private final int mUid;
		@@ -5242,7 +5219,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final class HistoricalPackageOps implements Parcelable {
		private final @NonNull String mPackageName;
		@@ -5573,7 +5549,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		/* codegen verifier cannot deal with nested class parameters
		@DataClass(genHiddenConstructor = true,
		@@ -5884,7 +5859,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		public static final class HistoricalOp implements Parcelable {
		private final int mOp;
		@@ -6521,7 +6495,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		@RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS)
		public @NonNull List<AppOpsManager.PackageOps> getOpsForPackage(int uid,
		@@ -6556,7 +6529,6 @@ public class AppOpsManager {
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		@RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS)
		public void getHistoricalOps(@NonNull HistoricalOpsRequest request,
		@@ -6665,7 +6637,6 @@ public class AppOpsManager {
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)
		public void setUidMode(@NonNull String appOp, int uid, @Mode int mode) {
		try {
		@@ -6719,7 +6690,6 @@ public class AppOpsManager {
		* be changed.
		* @hide
		*/
		@TestApi
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)
		public void setMode(@NonNull String op, int uid, @Nullable String packageName,
		@@ -8661,7 +8631,6 @@ public class AppOpsManager {
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(Manifest.permission.GET_APP_OPS_STATS)
		public @Nullable RuntimeAppOpAccessMessage collectRuntimeAppOpAccessMessage() {
		try {
		@@ -8676,7 +8645,6 @@ public class AppOpsManager {
		* @hide
		*/
		@SystemApi
		@TestApi
		public static String[] getOpStrs() {
		return Arrays.copyOf(sOpToString, sOpToString.length);
		}