Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Improve dumpsys backup"

Browse Source 
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: Ib2c525d2a5ce25a5bd852dfd3539bb72ce5869a3
This commit is contained in:
Wonyoung Kwak
2023-05-10 05:16:08 +00:00
parent 91e98fcb5a
commit 74fa63383d
2 changed files with 26 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -1515,73 +1515,41 @@ public class BackupManagerService extends IBackupManager.Stub {
@VisibleForTesting
void dumpWithoutCheckingPermission(FileDescriptor fd, PrintWriter pw, String[] args) {
int argIndex = 0;
String op = nextArg(args, argIndex);
argIndex++;
if ("--help".equals(op)) {
showDumpUsage(pw);
int userId = binderGetCallingUserId();
if (!isUserReadyForBackup(userId)) {
pw.println("Inactive");
return;
}
if ("users".equals(op)) {
pw.print(DUMP_RUNNING_USERS_MESSAGE);
for (int i = 0; i < mUserServices.size(); i++) {
UserBackupManagerService userBackupManagerService =
getServiceForUserIfCallerHasPermission(mUserServices.keyAt(i),
"dump()");
if (userBackupManagerService != null) {
pw.print(" " + userBackupManagerService.getUserId());
if (args != null) {
for (String arg : args) {
if ("-h".equals(arg)) {
pw.println("'dumpsys backup' optional arguments:");
pw.println(" -h : this help text");
pw.println(" a[gents] : dump information about defined backup agents");
pw.println(" transportclients : dump information about transport clients");
pw.println(" transportstats : dump transport statts");
pw.println(" users : dump the list of users for which backup service "
+ "is running");
return;
} else if ("users".equals(arg.toLowerCase())) {
pw.print(DUMP_RUNNING_USERS_MESSAGE);
for (int i = 0; i < mUserServices.size(); i++) {
pw.print(" " + mUserServices.keyAt(i));
}
pw.println();
return;
}
}
pw.println();
return;
}
if ("--user".equals(op)) {
String userArg = nextArg(args, argIndex);
argIndex++;
if (userArg == null) {
showDumpUsage(pw);
return;
}
int userId = UserHandle.parseUserArg(userArg);
for (int i = 0; i < mUserServices.size(); i++) {
UserBackupManagerService userBackupManagerService =
getServiceForUserIfCallerHasPermission(userId, "dump()");
getServiceForUserIfCallerHasPermission(mUserServices.keyAt(i), "dump()");
if (userBackupManagerService != null) {
userBackupManagerService.dump(fd, pw, args);
}
return;
}
if (op == null || "agents".startsWith(op) || "transportclients".equals(op)
|| "transportstats".equals(op)) {
for (int i = 0; i < mUserServices.size(); i++) {
UserBackupManagerService userBackupManagerService =
getServiceForUserIfCallerHasPermission(mUserServices.keyAt(i), "dump()");
if (userBackupManagerService != null) {
userBackupManagerService.dump(fd, pw, args);
}
}
return;
}
showDumpUsage(pw);
}
private String nextArg(String[] args, int argIndex) {
if (argIndex >= args.length) {
return null;
}
return args[argIndex];
}
private static void showDumpUsage(PrintWriter pw) {
pw.println("'dumpsys backup' optional arguments:");
pw.println(" --help : this help text");
pw.println(" a[gents] : dump information about defined backup agents");
pw.println(" transportclients : dump information about transport clients");
pw.println(" transportstats : dump transport stats");
pw.println(" users : dump the list of users for which backup service is running");
pw.println(" --user <userId> : dump information for user userId");
}
/**
@@ -1686,7 +1654,7 @@ public class BackupManagerService extends IBackupManager.Stub {
* @param message A message to include in the exception if it is thrown.
*/
void enforceCallingPermissionOnUserId(@UserIdInt int userId, String message) {
if (binderGetCallingUserId() != userId) {
if (Binder.getCallingUserHandle().getIdentifier() != userId) {
mContext.enforceCallingOrSelfPermission(
Manifest.permission.INTERACT_ACROSS_USERS_FULL, message);
}

45
services/tests/mockingservicestests/src/com/android/server/backup/BackupManagerServiceTest.java
View File

@@ -63,7 +63,6 @@ import com.android.server.SystemService;
import com.android.server.backup.utils.RandomAccessFileUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -616,50 +615,6 @@ public class BackupManagerServiceTest {
verify(mNonSystemUserBackupManagerService, never()).dump(any(), any(), any());
}
@Test
public void testDumpForOneUser_callerDoesNotHaveInteractAcrossUsersFullPermission_ignored() {
mService.setBackupServiceActive(NON_SYSTEM_USER, true);
simulateUserUnlocked(NON_SYSTEM_USER);
doThrow(new SecurityException())
.when(mContextMock)
.enforceCallingOrSelfPermission(
eq(Manifest.permission.INTERACT_ACROSS_USERS_FULL), anyString());
String[] args = new String[]{"--user", Integer.toString(NON_SYSTEM_USER)};
Assert.assertThrows(SecurityException.class,
() -> mService.dumpWithoutCheckingPermission(mFileDescriptorStub, mPrintWriterMock,
args));
verify(mNonSystemUserBackupManagerService, never()).dump(any(), any(), any());
}
@Test
public void
testDumpForOneUser_callerHasInteractAcrossUsersFullPermission_dumpsOnlySpecifiedUser() {
mService.setBackupServiceActive(NON_SYSTEM_USER, true);
simulateUserUnlocked(NON_SYSTEM_USER);
String[] args = new String[]{"--user", Integer.toString(UserHandle.USER_SYSTEM)};
mService.dumpWithoutCheckingPermission(mFileDescriptorStub, mPrintWriterMock, args);
verify(mSystemUserBackupManagerService).dump(any(), any(), any());
}
@Test
public void testDumpForAllUsers_callerHasInteractAcrossUsersFullPermission_dumpsAllUsers() {
mService.setBackupServiceActive(NON_SYSTEM_USER, true);
simulateUserUnlocked(NON_SYSTEM_USER);
String[] args = new String[]{"users"};
mService.dumpWithoutCheckingPermission(mFileDescriptorStub, mPrintWriterMock, args);
// Check that dump() invocations are not called on user's Backup service,
// as 'dumpsys backup users' only list users for whom Backup service is running.
verify(mSystemUserBackupManagerService, never()).dump(any(), any(), any());
verify(mNonSystemUserBackupManagerService, never()).dump(any(), any(), any());
}
/**
* Test that {@link BackupManagerService#dump(FileDescriptor, PrintWriter, String[])} dumps
* system user information before non-system user information.