Merge "Fix bmgr whitelist on HSUM devices" into main (d5edfef5) · Commits · e / os / android_frameworks_base

cmds/bmgr/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -130,6 +130,12 @@ public class Bmgr {
		return;
		}

		// The transport whitelist is a device-scoped property, so we skip isBackupActive check.
		if ("whitelist".equals(op)) {
		doPrintAllowlist();
		return;
		}

		if (!isBackupActive(userId)) {
		return;
		}
		@@ -199,11 +205,6 @@ public class Bmgr {
		return;
		}

		if ("whitelist".equals(op)) {
		doPrintAllowlist();
		return;
		}

		if ("scheduling".equals(op)) {
		setSchedulingEnabled(userId);
		return;

+2 −5

Original line number	Diff line number	Diff line
		@@ -1101,11 +1101,8 @@ public class BackupManagerService extends IBackupManager.Stub implements BackupM

		@Override
		public String[] getTransportWhitelist() {
		int userId = binderGetCallingUserId();
		if (!isUserReadyForBackup(userId)) {
		return null;
		}
		// No permission check, intentionally.
		// The transport whitelist is a device-scoped property, so we don't check the user's backup
		// status here.
		String[] whitelistedTransports = new String[mTransportWhitelist.size()];
		int i = 0;
		for (ComponentName component : mTransportWhitelist) {