Merge "Defer readSessionsLocked until system ready"

This commit is contained in:
TreeHugger Robot
2017-02-17 10:51:02 +00:00
committed by Android (Google) Code Review

View File

@@ -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(