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

Commit 8ff8e815 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... 

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

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



Change-Id: Ibfaa7ac4a67641bcd17f62ff7fc33b44c82d71b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f381b75e 0c4c18fe

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

+2 −2
Original line number Diff line number Diff line
@@ -1681,8 +1681,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
@@ -872,7 +872,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;