Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eee02b9f authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "PMS write settings on shutdown regardless of pending type" into tm-dev... 

Merge "PMS write settings on shutdown regardless of pending type" into tm-dev am: 47c493ab am: b3d7b7e2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17589578



Change-Id: I734f327afd0abb7faf7949365fde00593134cb68
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2193406f b3d7b7e2

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -2877,8 +2877,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
        synchronized (mLock) {

            mPackageUsage.writeNow(mSettings.getPackagesLocked());



            if (mHandler.hasMessages(WRITE_SETTINGS)) {

                mHandler.removeMessages(WRITE_SETTINGS);

            if (mHandler.hasMessages(WRITE_SETTINGS)

                    || mHandler.hasMessages(WRITE_PACKAGE_RESTRICTIONS)

                    || mHandler.hasMessages(WRITE_PACKAGE_LIST)) {

                writeSettings();

            }

        }