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

Commit 374ade0d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28488382',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28488382', 'googleplex-android-review.googlesource.com/28489342'] into 24Q3-release.

Change-Id: If2b58918f0c508cdddb70c8e5504ab87e650d161
parents 62e9e374 0966c964

core/java/android/service/dreams/DreamService.java

+3 −3
Original line number Diff line number Diff line
@@ -262,9 +262,9 @@ public class DreamService extends Service implements Window.Callback { 
    private boolean mDozing;

    private boolean mWindowless;

    private boolean mPreviewMode;

    private int mDozeScreenState = Display.STATE_UNKNOWN;

    private @Display.StateReason int mDozeScreenStateReason = Display.STATE_REASON_UNKNOWN;

    private int mDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;

    private volatile int mDozeScreenState = Display.STATE_UNKNOWN;

    private volatile @Display.StateReason int mDozeScreenStateReason = Display.STATE_REASON_UNKNOWN;

    private volatile int mDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;



    private boolean mDebug = false;

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

+3 −3
Original line number Diff line number Diff line
@@ -501,9 +501,9 @@ final class InstallPackageHelper { 
            mPm.setUpCustomResolverActivity(pkg, pkgSetting);

        }



        // When upgrading a package, pkgSetting is copied from oldPkgSetting. Clear the app

        // metadata file path for the new package.

        if (oldPkgSetting != null) {

        // When upgrading a package, clear the app metadata file path for the new package.

        if (oldPkgSetting != null

                && oldPkgSetting.getLastUpdateTime() < pkgSetting.getLastUpdateTime()) {

            pkgSetting.setAppMetadataFilePath(null);

            pkgSetting.setAppMetadataSource(APP_METADATA_SOURCE_UNKNOWN);

        }