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

Commit 988df700 authored by Eric Biggers's avatar Eric Biggers
Browse files

Use isCeStorageUnlocked() in window manager 

isUserKeyUnlocked() is being renamed to isCeStorageUnlocked() to make it
clear what it does (considering that there are many types of user keys).
Temporarily, the method exists under both names.  Change the window
manager to use the new name.  No change in behavior.

Bug: 306204742
Flag: exempt, mechanical refactoring
Test: presubmit
Change-Id: Ibf345159319fb54c684ad2e82a9266dfe4936d6b
parent 04e59b17

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;