Merge "PMS write settings on shutdown regardless of pending type" into tm-dev
This commit is contained in:
@@ -2877,8 +2877,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService
|
|||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
mPackageUsage.writeNow(mSettings.getPackagesLocked());
|
mPackageUsage.writeNow(mSettings.getPackagesLocked());
|
||||||
|
|
||||||
if (mHandler.hasMessages(WRITE_SETTINGS)) {
|
if (mHandler.hasMessages(WRITE_SETTINGS)
|
||||||
mHandler.removeMessages(WRITE_SETTINGS);
|
|| mHandler.hasMessages(WRITE_PACKAGE_RESTRICTIONS)
|
||||||
|
|| mHandler.hasMessages(WRITE_PACKAGE_LIST)) {
|
||||||
writeSettings();
|
writeSettings();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user