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

Commit 4822c23a authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5375030 from b0103b5e to pi-qpr3-b-release 

Change-Id: Ie99dc85e8e5a45b8208b0b0b2d59922ddd6de7b8
parents aa677d1f b0103b5e

packages/CtsShim/build/shim/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    package="com.android.cts.ctsshim" >



    <uses-sdk android:minSdkVersion="24"

        android:targetSdkVersion="24" />

        android:targetSdkVersion="28" />



    <restrict-update

        android:hash="__CAN_NOT_BE_UPDATED__" />

packages/CtsShim/build/shim_priv/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    package="com.android.cts.priv.ctsshim" >



    <uses-sdk android:minSdkVersion="24"

        android:targetSdkVersion="24" />

        android:targetSdkVersion="28" />



    <restrict-update

        android:hash="__HASH__" />

packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    package="com.android.cts.priv.ctsshim" >



    <uses-sdk android:minSdkVersion="24"

        android:targetSdkVersion="24" />

        android:targetSdkVersion="28" />



    <application

        android:hasCode="false"

services/core/java/com/android/server/am/ActivityStack.java

+3 −1
Original line number Diff line number Diff line
@@ -2494,7 +2494,9 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 


        if (prev != null && prev != next) {

            if (!mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(prev)

                    && next != null && !next.nowVisible) {

                    && next != null && !next.nowVisible

                    && checkKeyguardVisibility(next, true /* shouldBeVisible */,

                            next.isTopRunningActivity())) {

                mStackSupervisor.mActivitiesWaitingForVisibleActivity.add(prev);

                if (DEBUG_SWITCH) Slog.v(TAG_SWITCH,

                        "Resuming top, waiting visible to hide: " + prev);