Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d39576d authored Jan 31, 2024 by Karishma Vakil Committed by Android (Google) Code Review Jan 31, 2024

Merge "[DeviceAware] Track op accesses per device in AppOpsService" into main

parents 9ce0cdf5 49ec477e

apex/jobscheduler/service/java/com/android/server/AppStateTrackerImpl.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -743,7 +743,8 @@ public class AppStateTrackerImpl implements AppStateTracker {

		private final class AppOpsWatcher extends IAppOpsCallback.Stub {
		@Override
		public void opChanged(int op, int uid, String packageName) throws RemoteException {
		public void opChanged(int op, int uid, String packageName,
		String persistentDeviceId) throws RemoteException {
		boolean restricted = false;
		try {
		restricted = mAppOpsService.checkOperation(TARGET_OP,

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2026,8 +2026,8 @@ public class AlarmManagerService extends SystemService {
		iAppOpsService.startWatchingMode(AppOpsManager.OP_SCHEDULE_EXACT_ALARM, null,
		new IAppOpsCallback.Stub() {
		@Override
		public void opChanged(int op, int uid, String packageName)
		throws RemoteException {
		public void opChanged(int op, int uid, String packageName,
		String persistentDeviceId) throws RemoteException {
		final int userId = UserHandle.getUserId(uid);
		if (op != AppOpsManager.OP_SCHEDULE_EXACT_ALARM
		\|\| !isExactAlarmChangeEnabled(packageName, userId)) {

apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ public class InternalResourceService extends SystemService {

		private final IAppOpsCallback mApbListener = new IAppOpsCallback.Stub() {
		@Override
		public void opChanged(int op, int uid, String packageName) {
		public void opChanged(int op, int uid, String packageName, String persistentDeviceId) {
		boolean restricted = false;
		try {
		restricted = mAppOpsService.checkOperation(

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -671,7 +671,8 @@ public class AppStandbyController
		/packageName=/ null,
		new IAppOpsCallback.Stub() {
		@Override
		public void opChanged(int op, int uid, String packageName) {
		public void opChanged(int op, int uid, String packageName,
		String persistentDeviceId) {
		final int userId = UserHandle.getUserId(uid);
		synchronized (mSystemExemptionAppOpMode) {
		mSystemExemptionAppOpMode.delete(uid);

core/api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -5095,10 +5095,12 @@ package android.app {

		public static interface AppOpsManager.OnOpActiveChangedListener {
		method public void onOpActiveChanged(@NonNull String, int, @NonNull String, boolean);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public default void onOpActiveChanged(@NonNull String, int, @NonNull String, @Nullable String, int, boolean, int, int);
		}

		public static interface AppOpsManager.OnOpChangedListener {
		method public void onOpChanged(String, String);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public default void onOpChanged(@NonNull String, @NonNull String, int, @NonNull String);
		}

		public abstract static class AppOpsManager.OnOpNotedCallback {