From 91e98fcb5a9247485b0e86f0063f3c74d92cdbe7 Mon Sep 17 00:00:00 2001 From: Wonyoung Kwak Date: Wed, 10 May 2023 05:16:08 +0000 Subject: Revert "Modifying Backup code to support HSUM mode." Revert submission 22327091-br-cts-hsum Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_udc-dev&target=aosp_bramble-userdebug&lkgb=10098913&lkbb=10101009&fkbb=10098962, bug 281753581. Bug: 281753581 Reverted changes: /q/submissionid:22327091-br-cts-hsum Change-Id: I4de169440f587d5a458300a5f360ba974239e530 --- .../com/android/server/backup/BackupManagerServiceRoboTest.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'services/robotests/backup') 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 91dcd50f176a..94ee0a871448 100644 --- a/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceRoboTest.java +++ b/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceRoboTest.java @@ -33,7 +33,6 @@ 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; @@ -119,10 +118,6 @@ 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); @@ -1474,9 +1469,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); @@ -1490,8 +1485,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); -- cgit v1.2.3-59-g8ed1b