Show the stop button in the task manager for user allowlisted apps (1d40671e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -420,7 +420,7 @@ class FgsManagerController @Inject constructor(
	PowerExemptionManager.REASON_SYSTEM_UID,		PowerExemptionManager.REASON_SYSTEM_UID,
	PowerExemptionManager.REASON_DEVICE_DEMO_MODE -> UIControl.HIDE_ENTRY		PowerExemptionManager.REASON_DEVICE_DEMO_MODE -> UIControl.HIDE_ENTRY

	PowerExemptionManager.REASON_ALLOWLISTED_PACKAGE,		PowerExemptionManager.REASON_SYSTEM_ALLOW_LISTED,
	PowerExemptionManager.REASON_DEVICE_OWNER,		PowerExemptionManager.REASON_DEVICE_OWNER,
	PowerExemptionManager.REASON_DISALLOW_APPS_CONTROL,		PowerExemptionManager.REASON_DISALLOW_APPS_CONTROL,
	PowerExemptionManager.REASON_DPO_PROTECTED_APP,		PowerExemptionManager.REASON_DPO_PROTECTED_APP,

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

+46 −3

Original line number	Original line	Diff line number	Diff line
	@@ -265,6 +265,20 @@ public final class AppRestrictionController {
	*/		*/
	private int[] mDeviceIdleExceptIdleAllowlist = new int[0]; // No lock is needed.		private int[] mDeviceIdleExceptIdleAllowlist = new int[0]; // No lock is needed.

			/**
			* The pre-configured system app-ids in the power-save allow list.
			*
			* @see #mDeviceIdleAllowlist.
			*/
			private final ArraySet<Integer> mSystemDeviceIdleAllowlist = new ArraySet<>();

			/**
			* The pre-configured system app-ids in the power-save allow list, except-idle.
			*
			* @see #mDeviceIdleExceptIdleAllowlist.
			*/
			private final ArraySet<Integer> mSystemDeviceIdleExceptIdleAllowlist = new ArraySet<>();

	private final Object mLock = new Object();		private final Object mLock = new Object();
	private final Object mSettingsLock = new Object();		private final Object mSettingsLock = new Object();
	private final Injector mInjector;		private final Injector mInjector;
	@@ -1511,14 +1525,33 @@ public final class AppRestrictionController {
	}		}

	private void initBgRestrictionExemptioFromSysConfig() {		private void initBgRestrictionExemptioFromSysConfig() {
	mBgRestrictionExemptioFromSysConfig =		final SystemConfig sysConfig = SystemConfig.getInstance();
	SystemConfig.getInstance().getBgRestrictionExemption();		mBgRestrictionExemptioFromSysConfig = sysConfig.getBgRestrictionExemption();
	if (DEBUG_BG_RESTRICTION_CONTROLLER) {		if (DEBUG_BG_RESTRICTION_CONTROLLER) {
	final ArraySet<String> exemptedPkgs = mBgRestrictionExemptioFromSysConfig;		final ArraySet<String> exemptedPkgs = mBgRestrictionExemptioFromSysConfig;
	for (int i = exemptedPkgs.size() - 1; i >= 0; i--) {		for (int i = exemptedPkgs.size() - 1; i >= 0; i--) {
	Slog.i(TAG, "bg-restriction-exemption: " + exemptedPkgs.valueAt(i));		Slog.i(TAG, "bg-restriction-exemption: " + exemptedPkgs.valueAt(i));
	}		}
	}		}
			loadAppIdsFromPackageList(sysConfig.getAllowInPowerSaveExceptIdle(),
			mSystemDeviceIdleExceptIdleAllowlist);
			loadAppIdsFromPackageList(sysConfig.getAllowInPowerSave(), mSystemDeviceIdleAllowlist);
			}

			private void loadAppIdsFromPackageList(ArraySet<String> packages, ArraySet<Integer> apps) {
			final PackageManager pm = mInjector.getPackageManager();
			for (int i = packages.size() - 1; i >= 0; i--) {
			final String pkg = packages.valueAt(i);
			try {
			final ApplicationInfo ai = pm.getApplicationInfo(pkg,
			PackageManager.MATCH_SYSTEM_ONLY);
			if (ai == null) {
			continue;
			}
			apps.add(UserHandle.getAppId(ai.uid));
			} catch (PackageManager.NameNotFoundException e) {
			}
			}
	}		}

	private boolean isExemptedFromSysConfig(String packageName) {		private boolean isExemptedFromSysConfig(String packageName) {
	@@ -2685,6 +2718,13 @@ public final class AppRestrictionController {
	\|\| Arrays.binarySearch(mDeviceIdleExceptIdleAllowlist, appId) >= 0;		\|\| Arrays.binarySearch(mDeviceIdleExceptIdleAllowlist, appId) >= 0;
	}		}

			boolean isOnSystemDeviceIdleAllowlist(int uid) {
			final int appId = UserHandle.getAppId(uid);

			return mSystemDeviceIdleAllowlist.contains(appId)
			\|\| mSystemDeviceIdleExceptIdleAllowlist.contains(appId);
			}

	void setDeviceIdleAllowlist(int[] allAppids, int[] exceptIdleAppids) {		void setDeviceIdleAllowlist(int[] allAppids, int[] exceptIdleAppids) {
	mDeviceIdleAllowlist = allAppids;		mDeviceIdleAllowlist = allAppids;
	mDeviceIdleExceptIdleAllowlist = exceptIdleAppids;		mDeviceIdleExceptIdleAllowlist = exceptIdleAppids;
	@@ -2703,6 +2743,9 @@ public final class AppRestrictionController {
	if (UserHandle.isCore(uid)) {		if (UserHandle.isCore(uid)) {
	return REASON_SYSTEM_UID;		return REASON_SYSTEM_UID;
	}		}
			if (isOnSystemDeviceIdleAllowlist(uid)) {
			return REASON_SYSTEM_ALLOW_LISTED;
			}
	if (isOnDeviceIdleAllowlist(uid)) {		if (isOnDeviceIdleAllowlist(uid)) {
	return REASON_ALLOWLISTED_PACKAGE;		return REASON_ALLOWLISTED_PACKAGE;
	}		}
	@@ -2748,7 +2791,7 @@ public final class AppRestrictionController {
	} else if (isExemptedFromSysConfig(pkg)) {		} else if (isExemptedFromSysConfig(pkg)) {
	return REASON_SYSTEM_ALLOW_LISTED;		return REASON_SYSTEM_ALLOW_LISTED;
	} else if (mConstantsObserver.mBgRestrictionExemptedPackages.contains(pkg)) {		} else if (mConstantsObserver.mBgRestrictionExemptedPackages.contains(pkg)) {
	return REASON_ALLOWLISTED_PACKAGE;		return REASON_SYSTEM_ALLOW_LISTED;
	} else if (pm.isPackageStateProtected(pkg, userId)) {		} else if (pm.isPackageStateProtected(pkg, userId)) {
	return REASON_DPO_PROTECTED_APP;		return REASON_DPO_PROTECTED_APP;
	}		}