[DeviceAware] Delete unused methods in AppOpsCheckingServiceInterface
Bug: 299330771
Test: m (still builds)
Change-Id: I809a92c215371d538137f2edc90dac3fc4b9ea2f
diff --git a/services/core/java/com/android/server/appop/AppOpsCheckingServiceImpl.java b/services/core/java/com/android/server/appop/AppOpsCheckingServiceImpl.java
index 108f53f..0ee7d9c 100644
--- a/services/core/java/com/android/server/appop/AppOpsCheckingServiceImpl.java
+++ b/services/core/java/com/android/server/appop/AppOpsCheckingServiceImpl.java
@@ -305,26 +305,6 @@
}
@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) {
ArrayMap<String, SparseIntArray> packageModes = mUserPackageModes.get(userId, null);
diff --git a/services/core/java/com/android/server/appop/AppOpsCheckingServiceInterface.java b/services/core/java/com/android/server/appop/AppOpsCheckingServiceInterface.java
index 60d17cd..f6e6bc0 100644
--- a/services/core/java/com/android/server/appop/AppOpsCheckingServiceInterface.java
+++ b/services/core/java/com/android/server/appop/AppOpsCheckingServiceInterface.java
@@ -124,21 +124,6 @@
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.
*/
void clearAllModes();
diff --git a/services/core/java/com/android/server/appop/AppOpsCheckingServiceLoggingDecorator.java b/services/core/java/com/android/server/appop/AppOpsCheckingServiceLoggingDecorator.java
index 3fee59b..ccdf3a5 100644
--- a/services/core/java/com/android/server/appop/AppOpsCheckingServiceLoggingDecorator.java
+++ b/services/core/java/com/android/server/appop/AppOpsCheckingServiceLoggingDecorator.java
@@ -111,19 +111,6 @@
}
@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()");
mService.clearAllModes();
diff --git a/services/core/java/com/android/server/appop/AppOpsCheckingServiceTracingDecorator.java b/services/core/java/com/android/server/appop/AppOpsCheckingServiceTracingDecorator.java
index c0cc8b1..c3a02a8 100644
--- a/services/core/java/com/android/server/appop/AppOpsCheckingServiceTracingDecorator.java
+++ b/services/core/java/com/android/server/appop/AppOpsCheckingServiceTracingDecorator.java
@@ -168,28 +168,6 @@
}
@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,
"TaggedTracingAppOpsCheckingServiceInterfaceImpl#clearAllModes");
diff --git a/services/core/java/com/android/server/appop/AppOpsServiceTestingShim.java b/services/core/java/com/android/server/appop/AppOpsServiceTestingShim.java
index de73a55..98e6476 100644
--- a/services/core/java/com/android/server/appop/AppOpsServiceTestingShim.java
+++ b/services/core/java/com/android/server/appop/AppOpsServiceTestingShim.java
@@ -149,30 +149,6 @@
}
@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();
mNewImplementation.clearAllModes();
diff --git a/services/permission/java/com/android/server/permission/access/appop/AppOpService.kt b/services/permission/java/com/android/server/permission/access/appop/AppOpService.kt
index 26ea9d2..f94a0d6 100644
--- a/services/permission/java/com/android/server/permission/access/appop/AppOpService.kt
+++ b/services/permission/java/com/android/server/permission/access/appop/AppOpService.kt
@@ -145,16 +145,6 @@
opSparseArray
}
- override fun areUidModesDefault(uid: Int): Boolean {
- val modes = getUidModes(uid)
- return modes == null || modes.isEmpty()
- }
-
- override fun arePackageModesDefault(packageName: String, userId: Int): Boolean {
- val modes = service.getState { getPackageModes(packageName, userId) }
- return modes == null || modes.isEmpty()
- }
-
override fun clearAllModes() {
// We don't need to implement this because it's only called in AppOpsService#readState
// and we have our own persistence.
