From 39469f6260c158eaa2eace8ccc01ced404f0f552 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Fri, 5 Apr 2019 16:06:38 -0700
Subject: [PATCH] Remove setAllPkgModesToDefault

Bug: 124731615
Test: Built
Change-Id: Ia4d92791145a92fa0c89cf26fc9f627cf7dda559
---
 .../android/app/AppOpsManagerInternal.java    |  8 ----
 .../android/server/appop/AppOpsService.java   | 47 -------------------
 2 files changed, 55 deletions(-)

diff --git a/core/java/android/app/AppOpsManagerInternal.java b/core/java/android/app/AppOpsManagerInternal.java
index 08cad04401e9c..ac93875e2ec36 100644
--- a/core/java/android/app/AppOpsManagerInternal.java
+++ b/core/java/android/app/AppOpsManagerInternal.java
@@ -90,14 +90,6 @@ public abstract class AppOpsManagerInternal {
      */
     public abstract void setUidMode(int code, int uid, int mode);
 
-    /**
-     * Set all {@link #setMode (package) modes} for this uid to the default value.
-     *
-     * @param code The app-op
-     * @param uid The uid
-     */
-    public abstract void setAllPkgModesToDefault(int code, int uid);
-
     /**
      * Get the (raw) mode of an app-op.
      *
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 13f4385e75578..58e192b9aad61 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -1335,48 +1335,6 @@ public class AppOpsService extends IAppOpsService.Stub {
         }
     }
 
-    /**
-     * Set all {@link #setMode (package) modes} for this uid to the default value.
-     *
-     * @param code The app-op
-     * @param uid The uid
-     */
-    private void setAllPkgModesToDefault(int code, int uid) {
-        synchronized (this) {
-            UidState uidState = getUidStateLocked(uid, false);
-            if (uidState == null) {
-                return;
-            }
-
-            ArrayMap<String, Ops> pkgOps = uidState.pkgOps;
-            if (pkgOps == null) {
-                return;
-            }
-
-            boolean scheduleWrite = false;
-
-            int numPkgs = pkgOps.size();
-            for (int pkgNum = 0; pkgNum < numPkgs; pkgNum++) {
-                Ops ops = pkgOps.valueAt(pkgNum);
-
-                Op op = ops.get(code);
-                if (op == null) {
-                    continue;
-                }
-
-                int defaultMode = AppOpsManager.opToDefaultMode(code);
-                if (op.mode != defaultMode) {
-                    op.mode = defaultMode;
-                    scheduleWrite = true;
-                }
-            }
-
-            if (scheduleWrite) {
-                scheduleWriteLocked();
-            }
-        }
-    }
-
     @Override
     public void setMode(int code, int uid, String packageName, int mode) {
         setMode(code, uid, packageName, mode, true, false);
@@ -4575,11 +4533,6 @@ public class AppOpsService extends IAppOpsService.Stub {
             AppOpsService.this.setUidMode(code, uid, mode);
         }
 
-        @Override
-        public void setAllPkgModesToDefault(int code, int uid) {
-            AppOpsService.this.setAllPkgModesToDefault(code, uid);
-        }
-
         @Override
         public @Mode int checkOperationUnchecked(int code, int uid, @NonNull String packageName) {
             return AppOpsService.this.checkOperationUnchecked(code, uid, packageName, true, false);