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

Commit ba4b48c6 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Use isCeStorageUnlocked() in window manager" into main am: ecf90eb7 

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



Change-Id: I7533f1038afa86bb1ec1d7683082fd9133ef95ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4739ab77 ecf90eb7

services/core/java/com/android/server/wm/RootWindowContainer.java

+2 −2
Original line number Diff line number Diff line
@@ -1637,8 +1637,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            return false;

        }



        if (!StorageManager.isUserKeyUnlocked(mCurrentUser)) {

            // Can't launch home on secondary display areas if device is still locked.

        if (!StorageManager.isCeStorageUnlocked(mCurrentUser)) {

            // Can't launch home on secondary display areas if CE storage is still locked.

            return false;

        }

services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ public class RootWindowContainerTests extends WindowTestsBase { 
                new TestDisplayContent.Builder(mAtm, 1000, 1500)

                        .setSystemDecorations(true).build();



        // Use invalid user id to let StorageManager.isUserKeyUnlocked() return false.

        // Use invalid user id to let StorageManager.isCeStorageUnlocked() return false.

        final int currentUser = mRootWindowContainer.mCurrentUser;

        mRootWindowContainer.mCurrentUser = -1;