Merge "Update SAW exemption for user-initiated jobs." into main (58726557) · Commits · e / os / android_frameworks_base

apex/jobscheduler/framework/java/android/app/job/JobInfo.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2054,8 +2054,8 @@ public class JobInfo implements Parcelable {
		* or in a state where launching an activity is allowed, as defined
		* <a href=
		* "https://developer.android.com/guide/components/activities/background-starts#exceptions">
		* here</a>. Attempting to schedule one outside of these conditions will throw a
		* {@link SecurityException}.
		* here</a>. Attempting to schedule one outside of these conditions will return a
		* {@link JobScheduler#RESULT_FAILURE}.
		*
		* <p>
		* This should <b>NOT</b> be used for automatic features.

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1192,7 +1192,7 @@ public final class ActiveServices {
		// Use that as a shortcut if possible to avoid having to recheck all the conditions.
		final boolean whileInUseAllowsUiJobScheduling =
		ActivityManagerService.doesReasonCodeAllowSchedulingUserInitiatedJobs(
		r.getFgsAllowWiu_forStart());
		r.getFgsAllowWiu_forStart(), callingUid);
		r.updateAllowUiJobScheduling(whileInUseAllowsUiJobScheduling
		\|\| mAm.canScheduleUserInitiatedJobs(callingUid, callingPid, callingPackage));
		} else {

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

+33 −8

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_CONFIGURATION
		import static com.android.internal.util.FrameworkStatsLog.UNSAFE_INTENT_EVENT_REPORTED__EVENT_TYPE__INTERNAL_NON_EXPORTED_COMPONENT_MATCH;
		import static com.android.internal.util.FrameworkStatsLog.UNSAFE_INTENT_EVENT_REPORTED__EVENT_TYPE__NEW_MUTABLE_IMPLICIT_PENDING_INTENT_RETRIEVED;
		import static com.android.sdksandbox.flags.Flags.sdkSandboxInstrumentationInfo;
		import static com.android.server.am.ActiveServices.FGS_SAW_RESTRICTIONS;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALLOWLISTS;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_BACKGROUND_CHECK;
		@@ -6467,7 +6468,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		* This is a shortcut and <b>DOES NOT</b> include all reasons.
		* Use {@link #canScheduleUserInitiatedJobs(int, int, String)} to cover all cases.
		*/
		static boolean doesReasonCodeAllowSchedulingUserInitiatedJobs(int reasonCode) {
		static boolean doesReasonCodeAllowSchedulingUserInitiatedJobs(int reasonCode, int uid) {
		switch (reasonCode) {
		case REASON_PROC_STATE_PERSISTENT:
		case REASON_PROC_STATE_PERSISTENT_UI:
		@@ -6477,11 +6478,21 @@ public class ActivityManagerService extends IActivityManager.Stub
		case REASON_SYSTEM_UID:
		case REASON_START_ACTIVITY_FLAG:
		case REASON_ACTIVITY_VISIBILITY_GRACE_PERIOD:
		case REASON_SYSTEM_ALERT_WINDOW_PERMISSION:
		case REASON_COMPANION_DEVICE_MANAGER:
		case REASON_BACKGROUND_ACTIVITY_PERMISSION:
		case REASON_INSTR_BACKGROUND_ACTIVITY_PERMISSION:
		return true;
		case REASON_SYSTEM_ALERT_WINDOW_PERMISSION:
		if (!Flags.fgsDisableSaw()
		\|\| !CompatChanges.isChangeEnabled(FGS_SAW_RESTRICTIONS, uid)) {
		return true;
		} else {
		// With the new SAW restrictions starting Android V, only allow the app to
		// schedule a user-initiated job if it's currently showing an overlay window
		// in additional to holding the permission - this additional logic will be
		// checked in #canScheduleUserInitiatedJobs(int, int, String) below since this
		// method is simply a shortcut for checking based on the reason codes.
		}
		}
		return false;
		}
		@@ -6494,7 +6505,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		*/
		@GuardedBy(anyOf = {"this", "mProcLock"})
		private boolean isProcessInStateToScheduleUserInitiatedJobsLocked(
		@Nullable ProcessRecord pr, long nowElapsed) {
		@Nullable ProcessRecord pr, long nowElapsed, int uid) {
		if (pr == null) {
		return false;
		}
		@@ -6511,7 +6522,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		final int procstate = state.getCurProcState();
		if (procstate <= PROCESS_STATE_BOUND_TOP) {
		if (doesReasonCodeAllowSchedulingUserInitiatedJobs(
		getReasonCodeFromProcState(procstate))) {
		getReasonCodeFromProcState(procstate), uid)) {
		return true;
		}
		}
		@@ -6553,7 +6564,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		final long nowElapsed = SystemClock.elapsedRealtime();
		final BackgroundStartPrivileges backgroundStartPrivileges;
		if (processRecord != null) {
		if (isProcessInStateToScheduleUserInitiatedJobsLocked(processRecord, nowElapsed)) {
		if (isProcessInStateToScheduleUserInitiatedJobsLocked(
		processRecord, nowElapsed, uid)) {
		return true;
		}
		backgroundStartPrivileges = processRecord.getBackgroundStartPrivileges();
		@@ -6579,17 +6591,30 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		final UidRecord uidRecord = mProcessList.getUidRecordLOSP(uid);
		final boolean hasSawPermission = mAtmInternal.hasSystemAlertWindowPermission(uid, pid,
		pkgName);
		final boolean strictSawCheckEnabled = Flags.fgsDisableSaw()
		&& CompatChanges.isChangeEnabled(FGS_SAW_RESTRICTIONS, uid);
		if (uidRecord != null) {
		for (int i = uidRecord.getNumOfProcs() - 1; i >= 0; --i) {
		ProcessRecord pr = uidRecord.getProcessRecordByIndex(i);
		if (isProcessInStateToScheduleUserInitiatedJobsLocked(pr, nowElapsed)) {
		if (isProcessInStateToScheduleUserInitiatedJobsLocked(pr, nowElapsed, uid)) {
		return true;
		} else if (hasSawPermission && strictSawCheckEnabled) {
		// isProcessInStateToScheduleUserInitiatedJobsLocked() doesn't do a strict
		// check for the SAW permission which is enabled from V onwards, so perform
		// that here (pre-V versions will be checked in the conditional below)
		// Starting Android V, only allow the app to schedule a user-initiated job
		// if it's granted the permission and currently showing an overlay window
		if (pr != null && pr.mState.hasOverlayUi()) {
		return true;
		}
		}
		}
		}

		if (mAtmInternal.hasSystemAlertWindowPermission(uid, pid, pkgName)) {
		// REASON_SYSTEM_ALERT_WINDOW_PERMISSION;
		if (hasSawPermission && !strictSawCheckEnabled) {
		// REASON_SYSTEM_ALERT_WINDOW_PERMISSION (pre-V)
		return true;
		}