Merge changes from topic "br-cts-hsum" into udc-dev am: 82a2b5e93c am: 60c20b6b0f am: 66ce0276ea am: 0e44e10865

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22327092

Change-Id: I3e61ae7067b64b75d7ef671b7a40c13419f9006c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceRoboTest.java b/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceRoboTest.java
index 94ee0a871448..91dcd50f176a 100644
--- a/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceRoboTest.java
+++ b/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceRoboTest.java
@@ -33,6 +33,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 import static org.testng.Assert.expectThrows;
 
@@ -118,6 +119,10 @@ public class BackupManagerServiceRoboTest {
         mShadowUserManager.addUser(mUserOneId, "mUserOneId", 0);
         mShadowUserManager.addUser(mUserTwoId, "mUserTwoId", 0);
 
+        when(mUserSystemService.getUserId()).thenReturn(UserHandle.USER_SYSTEM);
+        when(mUserOneService.getUserId()).thenReturn(mUserOneId);
+        when(mUserTwoService.getUserId()).thenReturn(mUserTwoId);
+
         mShadowContext.grantPermissions(BACKUP);
         mShadowContext.grantPermissions(INTERACT_ACROSS_USERS_FULL);
 
@@ -1469,9 +1474,9 @@ public class BackupManagerServiceRoboTest {
         File testFile = createTestFile();
         FileDescriptor fileDescriptor = new FileDescriptor();
         PrintWriter printWriter = new PrintWriter(testFile);
-        String[] args = {"1", "2"};
         ShadowBinder.setCallingUserHandle(UserHandle.of(UserHandle.USER_SYSTEM));
 
+        String[] args = {"--user", "0"};
         backupManagerService.dump(fileDescriptor, printWriter, args);
 
         verify(mUserSystemService).dump(fileDescriptor, printWriter, args);
@@ -1485,8 +1490,8 @@ public class BackupManagerServiceRoboTest {
         File testFile = createTestFile();
         FileDescriptor fileDescriptor = new FileDescriptor();
         PrintWriter printWriter = new PrintWriter(testFile);
-        String[] args = {"1", "2"};
 
+        String[] args = {"--user", "10"};
         backupManagerService.dump(fileDescriptor, printWriter, args);
 
         verify(mUserOneService, never()).dump(fileDescriptor, printWriter, args);