commit 08a2dd12bbb48c2145c75721bca2ccc1c8c058aa
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 17 10:51:02 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 17 10:51:06 2017 +0000
tree f6493a35988f94bdc4d3da9a21df4baa6f94cde3
parent 1a8904abee7c354454cdfffdc783adc14d30b025
parent 606f8e79a210260a28b2629726740bf7e94c9f13

Merge "Defer readSessionsLocked until system ready"

services/core/java/com/android/server/pm/PackageInstallerService.java

diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index efd3132..8b4ef56 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -221,6 +221,10 @@
                 new File(Environment.getDataSystemDirectory(), "install_sessions.xml"));
         mSessionsDir = new File(Environment.getDataSystemDirectory(), "install_sessions");
         mSessionsDir.mkdirs();
+    }
+
+    public void systemReady() {
+        mAppOps = mContext.getSystemService(AppOpsManager.class);
 
         synchronized (mSessions) {
             readSessionsLocked();
@@ -245,10 +249,6 @@
         }
     }
 
-    public void systemReady() {
-        mAppOps = mContext.getSystemService(AppOpsManager.class);
-    }
-
     private void reconcileStagesLocked(String volumeUuid, boolean isEphemeral) {
         final File stagingDir = buildStagingDir(volumeUuid, isEphemeral);
         final ArraySet<File> unclaimedStages = newArraySet(