Merge "Defer readSessionsLocked until system ready" (08a2dd12) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -221,6 +221,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
		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 class PackageInstallerService extends IPackageInstaller.Stub {
		}
		}

		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(