Snap for 8573193 from 412f34a29a0dc139f59c27007266ad319c10e4d8 to tm-qpr1-release (667d2953) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+29 −4

Original line number	Diff line number	Diff line
		@@ -1335,9 +1335,17 @@ public class AppOpsManager {
		public static final int OP_ACCESS_RESTRICTED_SETTINGS =
		AppProtoEnums.APP_OP_ACCESS_RESTRICTED_SETTINGS;

		/**
		* Receive microphone audio from an ambient sound detection event
		*
		* @hide
		*/
		public static final int OP_RECEIVE_AMBIENT_TRIGGER_AUDIO =
		AppProtoEnums.APP_OP_RECEIVE_AMBIENT_TRIGGER_AUDIO;

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

		/** Access to coarse location information. */
		public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
		@@ -1800,6 +1808,14 @@ public class AppOpsManager {
		public static final String OPSTR_ACCESS_RESTRICTED_SETTINGS =
		"android:access_restricted_settings";

		/**
		* Receive microphone audio from an ambient sound detection event
		*
		* @hide
		*/
		public static final String OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO =
		"android:receive_ambient_trigger_audio";

		/** {@link #sAppOpsToNote} not initialized yet for this op */
		private static final byte SHOULD_COLLECT_NOTE_OP_NOT_INITIALIZED = 0;
		/** Should not collect noting of this app-op in {@link #sAppOpsToNote} */
		@@ -2021,6 +2037,7 @@ public class AppOpsManager {
		OP_ESTABLISH_VPN_SERVICE, // OP_ESTABLISH_VPN_SERVICE
		OP_ESTABLISH_VPN_MANAGER, // OP_ESTABLISH_VPN_MANAGER
		OP_ACCESS_RESTRICTED_SETTINGS, // OP_ACCESS_RESTRICTED_SETTINGS
		OP_RECEIVE_AMBIENT_TRIGGER_AUDIO, // RECEIVE_SOUNDTRIGGER_AUDIO
		};

		/**
		@@ -2147,6 +2164,7 @@ public class AppOpsManager {
		OPSTR_ESTABLISH_VPN_SERVICE,
		OPSTR_ESTABLISH_VPN_MANAGER,
		OPSTR_ACCESS_RESTRICTED_SETTINGS,
		OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO,
		};

		/**
		@@ -2274,6 +2292,7 @@ public class AppOpsManager {
		"ESTABLISH_VPN_SERVICE",
		"ESTABLISH_VPN_MANAGER",
		"ACCESS_RESTRICTED_SETTINGS",
		"RECEIVE_SOUNDTRIGGER_AUDIO",
		};

		/**
		@@ -2402,6 +2421,7 @@ public class AppOpsManager {
		null, // no permission for OP_ESTABLISH_VPN_SERVICE
		null, // no permission for OP_ESTABLISH_VPN_MANAGER
		null, // no permission for OP_ACCESS_RESTRICTED_SETTINGS,
		null, // no permission for OP_RECEIVE_SOUNDTRIGGER_AUDIO
		};

		/**
		@@ -2529,7 +2549,8 @@ public class AppOpsManager {
		null, // NEARBY_WIFI_DEVICES
		null, // ESTABLISH_VPN_SERVICE
		null, // ESTABLISH_VPN_MANAGER
		null, // ACCESS_RESTRICTED_SETTINGS,
		null, // ACCESS_RESTRICTED_SETTINGS
		null, // RECEIVE_SOUNDTRIGGER_AUDIO
		};

		/**
		@@ -2656,7 +2677,8 @@ public class AppOpsManager {
		null, // NEARBY_WIFI_DEVICES
		null, // ESTABLISH_VPN_SERVICE
		null, // ESTABLISH_VPN_MANAGER
		null, // ACCESS_RESTRICTED_SETTINGS,
		null, // ACCESS_RESTRICTED_SETTINGS
		null, // RECEIVE_SOUNDTRIGGER_AUDIO
		};

		/**
		@@ -2765,7 +2787,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ERRORED, // OP_NO_ISOLATED_STORAGE
		AppOpsManager.MODE_ALLOWED, // PHONE_CALL_MICROPHONE
		AppOpsManager.MODE_ALLOWED, // PHONE_CALL_CAMERA
		AppOpsManager.MODE_ALLOWED, // OP_RECORD_AUDIO_HOTWORD
		AppOpsManager.MODE_ALLOWED, // RECORD_AUDIO_HOTWORD
		AppOpsManager.MODE_DEFAULT, // MANAGE_ONGOING_CALLS
		AppOpsManager.MODE_DEFAULT, // MANAGE_CREDENTIALS
		AppOpsManager.MODE_DEFAULT, // USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER
		@@ -2783,6 +2805,7 @@ public class AppOpsManager {
		AppOpsManager.MODE_ALLOWED, // ESTABLISH_VPN_SERVICE
		AppOpsManager.MODE_ALLOWED, // ESTABLISH_VPN_MANAGER
		AppOpsManager.MODE_ALLOWED, // ACCESS_RESTRICTED_SETTINGS,
		AppOpsManager.MODE_ALLOWED, // RECEIVE_SOUNDTRIGGER_AUDIO
		};

		/**
		@@ -2913,6 +2936,7 @@ public class AppOpsManager {
		false, // OP_ESTABLISH_VPN_SERVICE
		false, // OP_ESTABLISH_VPN_MANAGER
		true, // ACCESS_RESTRICTED_SETTINGS
		false, // RECEIVE_SOUNDTRIGGER_AUDIO
		};

		/**
		@@ -3040,6 +3064,7 @@ public class AppOpsManager {
		false, // OP_ESTABLISH_VPN_SERVICE
		false, // OP_ESTABLISH_VPN_MANAGER
		true, // ACCESS_RESTRICTED_SETTINGS
		false, // RECEIVE_SOUNDTRIGGER_AUDIO
		};

		/**

core/java/android/app/admin/DevicePolicyResources.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,12 @@ public final class DevicePolicyResources {
		public static final String WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK =
		PREFIX + "WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK";

		/**
		* Text shown on the CTA link shown to user to set a separate lock for work apps
		*/
		public static final String WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK_ACTION =
		PREFIX + "WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK_ACTION";

		/**
		* Message shown in screen lock picker for setting up a work profile screen lock
		*/

core/java/android/permission/PermissionControllerManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -860,7 +860,7 @@ public final class PermissionControllerManager {
		Binder.restoreCallingIdentity(token);
		}
		}
		});
		}, executor);
		}

		/**

core/java/android/permission/PermissionUsageHelper.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import static android.app.AppOpsManager.OPSTR_COARSE_LOCATION;
		import static android.app.AppOpsManager.OPSTR_FINE_LOCATION;
		import static android.app.AppOpsManager.OPSTR_PHONE_CALL_CAMERA;
		import static android.app.AppOpsManager.OPSTR_PHONE_CALL_MICROPHONE;
		import static android.app.AppOpsManager.OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO;
		import static android.app.AppOpsManager.OPSTR_RECORD_AUDIO;
		import static android.app.AppOpsManager.OP_CAMERA;
		import static android.app.AppOpsManager.OP_FLAGS_ALL_TRUSTED;
		@@ -137,6 +138,7 @@ public class PermissionUsageHelper implements AppOpsManager.OnOpActiveChangedLis

		private static final List<String> MIC_OPS = List.of(
		OPSTR_PHONE_CALL_MICROPHONE,
		OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO,
		OPSTR_RECORD_AUDIO
		);

		@@ -147,6 +149,7 @@ public class PermissionUsageHelper implements AppOpsManager.OnOpActiveChangedLis

		private static @NonNull String getGroupForOp(String op) {
		switch (op) {
		case OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO:
		case OPSTR_RECORD_AUDIO:
		return MICROPHONE;
		case OPSTR_CAMERA:

core/java/android/service/wallpaper/WallpaperService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -904,6 +904,7 @@ public abstract class WallpaperService extends Service {
		// based on its default wallpaper color hints.
		mShouldDim = dimAmount != 0f \|\| mShouldDimByDefault;
		updateSurfaceDimming();
		updateSurface(false, false, true);
		}

		private void updateSurfaceDimming() {
		@@ -940,7 +941,6 @@ public abstract class WallpaperService extends Service {
		} else {
		Log.v(TAG, "Setting wallpaper dimming: " + 0);
		surfaceControlTransaction.setAlpha(mBbqSurfaceControl, 1.0f).apply();
		updateSurface(false, false, true);
		}

		mPreviousWallpaperDimAmount = mWallpaperDimAmount;