| commit | ecf90eb72ee6c1b9db5a0fd564d102ebc4802235 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Wed Nov 01 22:54:47 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Nov 01 22:54:47 2023 +0000 |
| tree | aff3e5852beecd95d2714dd57fe6e9577b025650 | |
| parent | e9c999d70ed5aa1196a33d28381c344907e429de [diff] | |
| parent | 988df7002d3ee11fde7c95907326a5b4fe33a39f [diff] |
Merge "Use isCeStorageUnlocked() in window manager" into main
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 9a0e47d..eba9bf6 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -1637,8 +1637,8 @@ 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; }
diff --git a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java index 3bc6450..b92cc64 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java
@@ -870,7 +870,7 @@ 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;