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

Commit 18c97eed authored by Yasin Kilicdere's avatar Yasin Kilicdere
Browse files

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
parent e8dbefd4

services/tests/servicestests/src/com/android/server/am/UserControllerTest.java

+8 −0
Original line number Diff line number Diff line
@@ -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);
@@ -1308,6 +1311,11 @@ public class UserControllerTest { 
            return mActivityTaskManagerInternal;

        }



        @Override

        PowerManagerInternal getPowerManagerInternal() {

            return mPowerManagerInternal;

        }



        @Override

        KeyguardManager getKeyguardManager() {

            return mKeyguardManagerMock;