Merge "Do not hold AppOpsService lock while calling DeviceConfig" into sc-dev

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

@@ -179,17 +179,20 @@ final class DiscreteRegistry {
     }
 
     void systemReady() {
-        synchronized (mOnDiskLock) {
-            mDiscreteAccessDir = new File(new File(Environment.getDataSystemDirectory(), "appops"),
-                    "discrete");
-            createDiscreteAccessDirLocked();
-            mDiscreteOps = new DiscreteOps();
-        }
         DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_PRIVACY,
                 AsyncTask.THREAD_POOL_EXECUTOR, (DeviceConfig.Properties p) -> {
                     setDiscreteHistoryParameters(p);
                 });
         setDiscreteHistoryParameters(DeviceConfig.getProperties(DeviceConfig.NAMESPACE_PRIVACY));
+        synchronized (mOnDiskLock) {
+            synchronized (mInMemoryLock) {
+                mDiscreteAccessDir = new File(
+                        new File(Environment.getDataSystemDirectory(), "appops"),
+                        "discrete");
+                createDiscreteAccessDirLocked();
+                mDiscreteOps = new DiscreteOps();
+            }
+        }
     }
 
     private void setDiscreteHistoryParameters(DeviceConfig.Properties p) {

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

@@ -246,10 +246,10 @@ final class HistoricalRegistry {
                                     + " by which to push history on next write");
                         }
                     }
-                    mDiscreteRegistry.systemReady();
                 }
             }
         }
+        mDiscreteRegistry.systemReady();
     }
 
     private boolean isPersistenceInitializedMLocked() {