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

Add missing synchronized block for PackageUsage

Browse Source 
mPackageUsage should be locked by mLock.

Bug: 171863889
Test: compile & verify basic functions working
Change-Id: Ic86f54fb0a7a447112936780412999897059e0fd
This commit is contained in:
Jeongsik Mun
2020-11-14 13:12:10 +09:00
committed by Todd Kennedy
parent 1d2102b503
commit 4b799bc13c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1738,6 +1738,7 @@ public class PackageManagerService extends IPackageManager.Stub
final @Nullable String mOverlayConfigSignaturePackage;
final @Nullable String mRecentsPackage;
@GuardedBy("mLock")
private final PackageUsage mPackageUsage = new PackageUsage();
private final CompilerStats mCompilerStats = new CompilerStats();
@@ -10630,13 +10631,14 @@ public class PackageManagerService extends IPackageManager.Stub
}
public void shutdown() {
mPackageUsage.writeNow(mSettings.mPackages);
mCompilerStats.writeNow();
mDexManager.writePackageDexUsageNow();
PackageWatchdog.getInstance(mContext).writeNow();
// This is the last chance to write out pending restriction settings
synchronized (mLock) {
mPackageUsage.writeNow(mSettings.mPackages);
// This is the last chance to write out pending restriction settings
if (mHandler.hasMessages(WRITE_PACKAGE_RESTRICTIONS)) {
mHandler.removeMessages(WRITE_PACKAGE_RESTRICTIONS);
for (int userId : mDirtyUsers) {
@@ -26032,7 +26034,9 @@ public class PackageManagerService extends IPackageManager.Stub
}
boolean isHistoricalPackageUsageAvailable() {
return mPackageUsage.isHistoricalPackageUsageAvailable();
synchronized (mLock) {
return mPackageUsage.isHistoricalPackageUsageAvailable();
}
}
/**