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

Merge "Call prepareAppDataAfterInstall without mPackages lock" into nyc-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2016-02-25 18:57:28 +00:00
committed by Android (Google) Code Review
parent 0f61ae26ce 3fb5b5d29c
commit e6ddf45e6b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10668,14 +10668,14 @@ public class PackageManagerService extends IPackageManager.Stub {
pkgSetting.setInstalled(true, userId);
pkgSetting.setHidden(false, userId);
mSettings.writePackageRestrictionsLPr(userId);
if (pkgSetting.pkg != null) {
prepareAppDataAfterInstall(pkgSetting.pkg);
}
installed = true;
}
}
if (installed) {
if (pkgSetting.pkg != null) {
prepareAppDataAfterInstall(pkgSetting.pkg);
}
sendPackageAddedForUser(packageName, pkgSetting, userId);
}
} finally {
@@ -18047,6 +18047,8 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
* correct for all installed apps. If there is an ownership mismatch, it
* will try recovering system apps by wiping data; third-party app data is
* left intact.
* <p>
* <em>Note: To avoid a deadlock, do not call this method with {@code mPackages} lock held</em>
*/
private void prepareAppDataAfterInstall(PackageParser.Package pkg) {
prepareAppDataAfterInstallInternal(pkg);