commit 85a6775e8a7eea7a3865525c575473f3e1c37542
author Antonio Kantek <kanant@google.com> Thu Mar 21 02:06:10 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 21 02:06:10 2024 +0000
tree 2768197197829769456f8107eaa4ce3a748fcc22
parent 599d6368d1ba6ae7a257b8325fab12fad617a735
parent f4f4c6833685dd5fa8a5d7ae1944321e6d7bf227

Merge "Set ActivityManager to set the test callerId as the currentUserId" into main

services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java

diff --git a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
index b9c5b36..b4cf799 100644
--- a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
+++ b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
@@ -203,6 +203,7 @@
                 .thenReturn(new int[] {0});
         when(mMockUserManagerInternal.getUserIds()).thenReturn(new int[] {0});
         when(mMockActivityManagerInternal.isSystemReady()).thenReturn(true);
+        when(mMockActivityManagerInternal.getCurrentUserId()).thenReturn(mCallingUserId);
         when(mMockPackageManagerInternal.getPackageUid(anyString(), anyLong(), anyInt()))
                 .thenReturn(Binder.getCallingUid());
         when(mMockPackageManagerInternal.isSameApp(anyString(), anyLong(), anyInt(), anyInt()))