Merge "Add am command to list sysconfig to the bg restriction exemptions" into tm-dev (a3bc30b5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -343,6 +343,8 @@ final class ActivityManagerShellCommand extends ShellCommand {
		return runSetStopUserOnSwitch(pw);
		case "set-bg-abusive-uids":
		return runSetBgAbusiveUids(pw);
		case "list-bg-exemptions-config":
		return runListBgExemptionsConfig(pw);
		default:
		return handleDefaultCommands(cmd);
		}
		@@ -3292,6 +3294,19 @@ final class ActivityManagerShellCommand extends ShellCommand {
		return 0;
		}

		private int runListBgExemptionsConfig(PrintWriter pw) throws RemoteException {
		final ArraySet<String> sysConfigs = mInternal.mAppRestrictionController
		.mBgRestrictionExemptioFromSysConfig;
		if (sysConfigs != null) {
		for (int i = 0, size = sysConfigs.size(); i < size; i++) {
		pw.print(sysConfigs.valueAt(i));
		pw.print(' ');
		}
		pw.println();
		}
		return 0;
		}

		private Resources getResources(PrintWriter pw) throws RemoteException {
		// system resources does not contain all the device configuration, construct it manually.
		Configuration config = mInterface.getConfiguration();

+1 −1

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ public final class AppRestrictionController {
		/**
		* The pre-config packages that are exempted from the background restrictions.
		*/
		private ArraySet<String> mBgRestrictionExemptioFromSysConfig;
		ArraySet<String> mBgRestrictionExemptioFromSysConfig;

		/**
		* Lock specifically for bookkeeping around the carrier-privileged app set.