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

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import android.content.Context;
		*
		* @hide
		*/
		@TestApi
		@SystemApi
		@SystemService(Context.DEVICE_IDLE_CONTROLLER)
		public class DeviceIdleManager {

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;
		@@ -39,7 +38,6 @@ import java.util.List;
		* @hide
		*/
		@SystemApi
		@TestApi
		@SystemService(Context.POWER_WHITELIST_MANAGER)
		public class PowerWhitelistManager {
		private final Context mContext;

api/test-current.txt

+7 −3385

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
		@@ -3608,7 +3608,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 {
		@@ -3628,7 +3628,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 {
		@@ -3645,7 +3645,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
		@@ -3676,7 +3676,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) {
		@@ -3705,7 +3705,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) {
		@@ -3847,7 +3847,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());
		@@ -4186,7 +4186,6 @@ public class ActivityManager {
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(android.Manifest.permission.MANAGE_USERS)
		public boolean switchUser(@NonNull UserHandle user) {
		if (user == null) {
		@@ -4619,7 +4618,7 @@ public class ActivityManager {
		*
		* @hide
		*/
		@SystemApi @TestApi
		@SystemApi
		@RequiresPermission(Manifest.permission.FORCE_STOP_PACKAGES)
		public void killProcessesWhenImperceptible(@NonNull int[] pids, @NonNull String reason) {
		try {