diff options
| author | 2024-02-20 11:26:42 +0000 | |
|---|---|---|
| committer | 2024-02-20 11:26:42 +0000 | |
| commit | 18c97eed6e794ecc9e74d69f41c240dce201c670 (patch) | |
| tree | 2b2361f62d12714dcd7d6e33bca38a1e84ac8053 | |
| parent | e8dbefd4d60e51106881725500200c6392424c83 (diff) | |
Fix NPE in UserControllerTest#testFailedStartUserInForeground.
After ag/26230226, UserControllerTest#testFailedStartUserInForeground
was failing with a NullPointerException. This CL fixes that issue.
Fixes: 325461478
Bug: 311070231
Bug: 325249845
Test: atest UserControllerTest#testFailedStartUserInForeground
Flag: None
Change-Id: Ic68de2f3edac4ea8f2e359bbc851620f909cc55e
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/am/UserControllerTest.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java index 4307ec5aa7e1..cea10ea9ade4 100644 --- a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java @@ -87,6 +87,7 @@ import android.os.HandlerThread; import android.os.IRemoteCallback; import android.os.Looper; import android.os.Message; +import android.os.PowerManagerInternal; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; @@ -1223,6 +1224,7 @@ public class UserControllerTest { private final UserManagerInternal mUserManagerInternalMock; private final WindowManagerService mWindowManagerMock; private final ActivityTaskManagerInternal mActivityTaskManagerInternal; + private final PowerManagerInternal mPowerManagerInternal; private final KeyguardManager mKeyguardManagerMock; private final LockPatternUtils mLockPatternUtilsMock; @@ -1244,6 +1246,7 @@ public class UserControllerTest { mWindowManagerMock = mock(WindowManagerService.class); mActivityTaskManagerInternal = mock(ActivityTaskManagerInternal.class); mStorageManagerMock = mock(IStorageManager.class); + mPowerManagerInternal = mock(PowerManagerInternal.class); mKeyguardManagerMock = mock(KeyguardManager.class); when(mKeyguardManagerMock.isDeviceSecure(anyInt())).thenReturn(true); mLockPatternUtilsMock = mock(LockPatternUtils.class); @@ -1309,6 +1312,11 @@ public class UserControllerTest { } @Override + PowerManagerInternal getPowerManagerInternal() { + return mPowerManagerInternal; + } + + @Override KeyguardManager getKeyguardManager() { return mKeyguardManagerMock; } |