Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid restart when inserting/ejecting adopted." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-04 02:02:38 +00:00
committed by Android (Google) Code Review
parent 623620651a 379d52be47
commit c8cc38c8c5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -18838,9 +18838,14 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
continue; continue;
} }
sm.prepareUserStorage(volumeUuid, user.id, user.serialNumber, flags); try {
synchronized (mInstallLock) { sm.prepareUserStorage(volumeUuid, user.id, user.serialNumber, flags);
reconcileAppsDataLI(volumeUuid, user.id, flags); synchronized (mInstallLock) {
reconcileAppsDataLI(volumeUuid, user.id, flags);
}
} catch (IllegalStateException e) {
// Device was probably ejected, and we'll process that event momentarily
Slog.w(TAG, "Failed to prepare storage: " + e);
} }
} }