Merge "[DeviceAware] Delete unused methods in AppOpsCheckingServiceInterface" into main (567054d8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/appop/AppOpsCheckingServiceImpl.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -304,26 +304,6 @@ public class AppOpsCheckingServiceImpl implements AppOpsCheckingServiceInterface
		}
		}

		@Override
		public boolean areUidModesDefault(int uid) {
		synchronized (mLock) {
		SparseIntArray opModes = mUidModes.get(uid);
		return (opModes == null \|\| opModes.size() <= 0);
		}
		}

		@Override
		public boolean arePackageModesDefault(@NonNull String packageName, @UserIdInt int userId) {
		synchronized (mLock) {
		ArrayMap<String, SparseIntArray> packageModes = mUserPackageModes.get(userId, null);
		if (packageModes == null) {
		return true;
		}
		SparseIntArray opModes = packageModes.get(packageName);
		return (opModes == null \|\| opModes.size() <= 0);
		}
		}

		@Override
		public boolean removePackage(String packageName, @UserIdInt int userId) {
		synchronized (mLock) {

+0 −15

Original line number	Diff line number	Diff line
		@@ -123,21 +123,6 @@ public interface AppOpsCheckingServiceInterface {
		*/
		void removeUid(int uid);

		/**
		* Returns true if all uid modes for this uid are
		* in default state.
		* @param uid user id
		*/
		boolean areUidModesDefault(int uid);

		/**
		* Returns true if all package modes for this package name are
		* in default state.
		* @param packageName package name.
		* @param userId user id associated with the package.
		*/
		boolean arePackageModesDefault(String packageName, @UserIdInt int userId);

		/**
		* Stop tracking app-op modes for all uid and packages.
		*/

+0 −13

Original line number	Diff line number	Diff line
		@@ -110,19 +110,6 @@ public class AppOpsCheckingServiceLoggingDecorator implements AppOpsCheckingServ
		mService.removeUid(uid);
		}

		@Override
		public boolean areUidModesDefault(int uid) {
		Log.i(LOG_TAG, "areUidModesDefault(uid = " + uid + ")");
		return mService.areUidModesDefault(uid);
		}

		@Override
		public boolean arePackageModesDefault(String packageName, int userId) {
		Log.i(LOG_TAG, "arePackageModesDefault(packageName = " + packageName + ", userId = "
		+ userId + ")");
		return mService.arePackageModesDefault(packageName, userId);
		}

		@Override
		public void clearAllModes() {
		Log.i(LOG_TAG, "clearAllModes()");

+0 −22

Original line number	Diff line number	Diff line
		@@ -167,28 +167,6 @@ public class AppOpsCheckingServiceTracingDecorator implements AppOpsCheckingServ
		}
		}

		@Override
		public boolean areUidModesDefault(int uid) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#areUidModesDefault");
		try {
		return mService.areUidModesDefault(uid);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public boolean arePackageModesDefault(String packageName, @UserIdInt int userId) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#arePackageModesDefault");
		try {
		return mService.arePackageModesDefault(packageName, userId);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void clearAllModes() {
		Trace.traceBegin(TRACE_TAG,

+0 −24

Original line number	Diff line number	Diff line
		@@ -148,30 +148,6 @@ public class AppOpsServiceTestingShim implements AppOpsCheckingServiceInterface
		mNewImplementation.removeUid(uid);
		}

		@Override
		public boolean areUidModesDefault(int uid) {
		boolean oldVal = mOldImplementation.areUidModesDefault(uid);
		boolean newVal = mNewImplementation.areUidModesDefault(uid);

		if (oldVal != newVal) {
		signalImplDifference("areUidModesDefault");
		}

		return newVal;
		}

		@Override
		public boolean arePackageModesDefault(String packageName, int userId) {
		boolean oldVal = mOldImplementation.arePackageModesDefault(packageName, userId);
		boolean newVal = mNewImplementation.arePackageModesDefault(packageName, userId);

		if (oldVal != newVal) {
		signalImplDifference("arePackageModesDefault");
		}

		return newVal;
		}

		@Override
		public void clearAllModes() {
		mOldImplementation.clearAllModes();