Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." (bc7671b9) · Commits · e / os / android_frameworks_base

core/java/android/animation/ValueAnimator.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -296,6 +296,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio
	/**		/**
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static void setDurationScale(float durationScale) {		public static void setDurationScale(float durationScale) {
	sDurationScale = durationScale;		sDurationScale = durationScale;
	@@ -304,6 +305,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio
	/**		/**
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static float getDurationScale() {		public static float getDurationScale() {
	return sDurationScale;		return sDurationScale;

core/java/android/app/Activity.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2797,6 +2797,7 @@ public class Activity extends ContextThemeWrapper
	* @see View#onMovedToDisplay(int, Configuration)		* @see View#onMovedToDisplay(int, Configuration)
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public void onMovedToDisplay(int displayId, Configuration config) {		public void onMovedToDisplay(int displayId, Configuration config) {
	}		}

core/java/android/app/ActivityManager.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2982,6 +2982,7 @@ public class ActivityManager {
	*		*
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170;		public static final int IMPORTANCE_CANT_SAVE_STATE_PRE_26 = 170;

core/java/android/app/AppOpsManager.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -581,6 +581,7 @@ public class AppOpsManager {
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static final int OP_NONE = -1;		public static final int OP_NONE = -1;
	/** @hide Access to coarse location information. */		/** @hide Access to coarse location information. */
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static final int OP_COARSE_LOCATION = 0;		public static final int OP_COARSE_LOCATION = 0;
	/** @hide Access to fine location information. */		/** @hide Access to fine location information. */
	@@ -653,6 +654,7 @@ public class AppOpsManager {
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static final int OP_WRITE_SETTINGS = 23;		public static final int OP_WRITE_SETTINGS = 23;
	/** @hide Required to draw on top of other apps. */		/** @hide Required to draw on top of other apps. */
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static final int OP_SYSTEM_ALERT_WINDOW = 24;		public static final int OP_SYSTEM_ALERT_WINDOW = 24;
	/** @hide */		/** @hide */
	@@ -662,6 +664,7 @@ public class AppOpsManager {
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static final int OP_CAMERA = 26;		public static final int OP_CAMERA = 26;
	/** @hide */		/** @hide */
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static final int OP_RECORD_AUDIO = 27;		public static final int OP_RECORD_AUDIO = 27;
	/** @hide */		/** @hide */
	@@ -809,6 +812,7 @@ public class AppOpsManager {
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static final int OP_MANAGE_IPSEC_TUNNELS = 75;		public static final int OP_MANAGE_IPSEC_TUNNELS = 75;
	/** @hide Any app start foreground service. */		/** @hide Any app start foreground service. */
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static final int OP_START_FOREGROUND = 76;		public static final int OP_START_FOREGROUND = 76;
	/** @hide */		/** @hide */
	@@ -2147,6 +2151,7 @@ public class AppOpsManager {
	* Retrieve the permission associated with an operation, or null if there is not one.		* Retrieve the permission associated with an operation, or null if there is not one.
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static String opToPermission(int op) {		public static String opToPermission(int op) {
	return sOpPerms[op];		return sOpPerms[op];
	@@ -2179,6 +2184,7 @@ public class AppOpsManager {
	* to the corresponding app op.		* to the corresponding app op.
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static int permissionToOpCode(String permission) {		public static int permissionToOpCode(String permission) {
	Integer boxedOpCode = sPermToOp.get(permission);		Integer boxedOpCode = sPermToOp.get(permission);
	@@ -5281,6 +5287,7 @@ public class AppOpsManager {
	}		}

	/** @hide */		/** @hide */
			@UnsupportedAppUsage
	@TestApi		@TestApi
	@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)		@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)
	public void setMode(int code, int uid, String packageName, @Mode int mode) {		public void setMode(int code, int uid, String packageName, @Mode int mode) {
	@@ -5627,6 +5634,7 @@ public class AppOpsManager {
	/**		/**
	* {@hide}		* {@hide}
	*/		*/
			@UnsupportedAppUsage
	@TestApi		@TestApi
	public static int strOpToOp(@NonNull String op) {		public static int strOpToOp(@NonNull String op) {
	Integer val = sOpStrToOp.get(op);		Integer val = sOpStrToOp.get(op);

core/java/android/app/ContextImpl.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2361,6 +2361,7 @@ class ContextImpl extends Context {
	return (mFlags & Context.CONTEXT_IGNORE_SECURITY) != 0;		return (mFlags & Context.CONTEXT_IGNORE_SECURITY) != 0;
	}		}

			@UnsupportedAppUsage
	@TestApi		@TestApi
	@Override		@Override
	public Display getDisplay() {		public Display getDisplay() {