Merge "Merge "Fix SecurityControllerTest" into rvc-dev am: 6d03d973c0 am: e4dd53af2b" into rvc-d1-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2020-02-25 19:17:41 +00:00
committed by Android (Google) Code Review

View File

@@ -86,6 +86,7 @@ public class SecurityControllerTest extends SysuiTestCase implements SecurityCon
mContext.addMockService(comp, mKeyChainService);
when(mUserManager.getUserInfo(anyInt())).thenReturn(new UserInfo());
when(mUserManager.isUserUnlocked(any())).thenReturn(true);
when(mKeyChainService.getUserCaAliases())
.thenReturn(new StringParceledListSlice(new ArrayList<String>()));