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

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

Snap for 10935304 from 31740877 to udc-qpr1-release 

Change-Id: I696931b03ca8869d8ade8130492ae3bf8077d0d7
parents 8ba3484a 31740877

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ public class PackageInstallerActivity extends AlertActivity { 
            final int sessionId = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID,

                    -1 /* defaultValue */);

            final SessionInfo info = mInstaller.getSessionInfo(sessionId);

            String resolvedPath = info.getResolvedBaseApkPath();

            String resolvedPath = info != null ? info.getResolvedBaseApkPath() : null;

            if (info == null || !info.isSealed() || resolvedPath == null) {

                Log.w(TAG, "Session " + mSessionId + " in funky state; ignoring");

                finish();

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -2900,7 +2900,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


                updateVisibleToUser();

                updateIsKeyguard();

                // TODO(b/301913237): can't delay transition if config_displayBlanksAfterDoze=true,

                // otherwise, the clock will flicker during LOCKSCREEN_TRANSITION_FROM_AOD

                mShouldDelayLockscreenTransitionFromAod = mDozeParameters.getAlwaysOn()

                        && !mDozeParameters.getDisplayNeedsBlanking()

                        && mFeatureFlags.isEnabled(

                                Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD);

                if (!mShouldDelayLockscreenTransitionFromAod) {