Merge "Add new AppOp for cell identity and information access" into main (4c08de62) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+33 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1718,9 +1718,24 @@ public class AppOpsManager {
	public static final int OP_SYSTEM_APPLICATION_OVERLAY =		public static final int OP_SYSTEM_APPLICATION_OVERLAY =
	AppOpEnums.APP_OP_SYSTEM_APPLICATION_OVERLAY;		AppOpEnums.APP_OP_SYSTEM_APPLICATION_OVERLAY;

			/**
			* Access cell identity data.
			*
			* @hide
			*/
			public static final int OP_READ_CELL_IDENTITY = AppOpEnums.APP_OP_READ_CELL_IDENTITY;

			/**
			* Access cell info data such as connection status or registered to a
			* mobile network.
			*
			* @hide
			*/
			public static final int OP_READ_CELL_INFO = AppOpEnums.APP_OP_READ_CELL_INFO;

	/** @hide */		/** @hide */
	@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
	public static final int _NUM_OP = 165;		public static final int _NUM_OP = 167;

	/**		/**
	* All app ops represented as strings.		* All app ops represented as strings.
	@@ -1888,7 +1903,9 @@ public class AppOpsManager {
	OPSTR_SCENE_UNDERSTANDING_COARSE,		OPSTR_SCENE_UNDERSTANDING_COARSE,
	OPSTR_SCENE_UNDERSTANDING_FINE,		OPSTR_SCENE_UNDERSTANDING_FINE,
	OPSTR_POST_PROMOTED_NOTIFICATIONS,		OPSTR_POST_PROMOTED_NOTIFICATIONS,
	OPSTR_SYSTEM_APPLICATION_OVERLAY		OPSTR_SYSTEM_APPLICATION_OVERLAY,
			OPSTR_READ_CELL_IDENTITY,
			OPSTR_READ_CELL_INFO
	})		})
	public @interface AppOpString {}		public @interface AppOpString {}

	@@ -2695,6 +2712,12 @@ public class AppOpsManager {
	public static final String OPSTR_SYSTEM_APPLICATION_OVERLAY =		public static final String OPSTR_SYSTEM_APPLICATION_OVERLAY =
	"android:system_application_overlay";		"android:system_application_overlay";

			/** @hide Read telephony cell identity. */
			public static final String OPSTR_READ_CELL_IDENTITY = "android:read_cell_identity";

			/** @hide Read telephony cell information. */
			public static final String OPSTR_READ_CELL_INFO = "android:read_cell_info";

	/** {@link #sAppOpsToNote} not initialized yet for this op */		/** {@link #sAppOpsToNote} not initialized yet for this op */
	private static final byte SHOULD_COLLECT_NOTE_OP_NOT_INITIALIZED = 0;		private static final byte SHOULD_COLLECT_NOTE_OP_NOT_INITIALIZED = 0;
	/** Should not collect noting of this app-op in {@link #sAppOpsToNote} */		/** Should not collect noting of this app-op in {@link #sAppOpsToNote} */
	@@ -3365,6 +3388,14 @@ public class AppOpsManager {
	.setPermission(com.android.media.projection.flags.Flags.recordingOverlay()		.setPermission(com.android.media.projection.flags.Flags.recordingOverlay()
	? Manifest.permission.SYSTEM_APPLICATION_OVERLAY : null)		? Manifest.permission.SYSTEM_APPLICATION_OVERLAY : null)
	.build(),		.build(),
			new AppOpInfo.Builder(OP_READ_CELL_IDENTITY, OPSTR_READ_CELL_IDENTITY,
			"READ_CELL_IDENTITY")
			.setDefaultMode(AppOpsManager.MODE_ALLOWED)
			.build(),
			new AppOpInfo.Builder(OP_READ_CELL_INFO, OPSTR_READ_CELL_INFO,
			"READ_CELL_INFO")
			.setDefaultMode(AppOpsManager.MODE_ALLOWED)
			.build(),
	};		};

	// The number of longs needed to form a full bitmask of app ops		// The number of longs needed to form a full bitmask of app ops