Snap for 10146593 from 3f6b12d0d2dabda3975c9a3fe5c331081b9834c2 to udc-qpr1-release (391f51f9) · Commits · e / os / android_frameworks_base

apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,15 @@ public class PowerExemptionManager {
		*/
		public static final int TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED = 1;

		/**
		* Delay freezing the app when the broadcast is delivered. This flag is not required if
		* TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED or
		* TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED are specified, as those will
		* already defer freezing during the allowlist duration.
		* @hide temporarily until the next release
		*/
		public static final int TEMPORARY_ALLOW_LIST_TYPE_APP_FREEZING_DELAYED = 1 << 2;

		/**
		* The list of temp allow list types.
		* @hide
		@@ -105,6 +114,7 @@ public class PowerExemptionManager {
		TEMPORARY_ALLOW_LIST_TYPE_NONE,
		TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_ALLOWED,
		TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED,
		TEMPORARY_ALLOW_LIST_TYPE_APP_FREEZING_DELAYED
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface TempAllowListType {}
		@@ -216,6 +226,11 @@ public class PowerExemptionManager {
		* Set temp-allow-list for transferring accounts between users.
		*/
		public static final int REASON_ACCOUNT_TRANSFER = 104;
		/**
		* Set temp-allow-list for server push messaging that can be deferred.
		* @hide temporarily until the next release
		*/
		public static final int REASON_PUSH_MESSAGING_DEFERRABLE = 105;

		/* Reason code range 200-299 are reserved for broadcast actions */
		/**
		@@ -449,6 +464,7 @@ public class PowerExemptionManager {
		REASON_PUSH_MESSAGING_OVER_QUOTA,
		REASON_ACTIVITY_RECOGNITION,
		REASON_ACCOUNT_TRANSFER,
		REASON_PUSH_MESSAGING_DEFERRABLE,
		REASON_BOOT_COMPLETED,
		REASON_PRE_BOOT_COMPLETED,
		REASON_LOCKED_BOOT_COMPLETED,
		@@ -781,6 +797,8 @@ public class PowerExemptionManager {
		return "ACTIVITY_RECOGNITION";
		case REASON_ACCOUNT_TRANSFER:
		return "REASON_ACCOUNT_TRANSFER";
		case REASON_PUSH_MESSAGING_DEFERRABLE:
		return "PUSH_MESSAGING_DEFERRABLE";
		case REASON_BOOT_COMPLETED:
		return "BOOT_COMPLETED";
		case REASON_PRE_BOOT_COMPLETED:

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+33 −24

Original line number	Diff line number	Diff line
		@@ -2600,10 +2600,14 @@ public class JobSchedulerService extends com.android.server.SystemService
		} else {
		numSystemStops++;
		}
		final int backoffAttempts = Math.max(1,
		numFailures + numSystemStops / mConstants.SYSTEM_STOP_TO_FAILURE_RATIO);
		long delayMillis;
		final int backoffAttempts =
		numFailures + numSystemStops / mConstants.SYSTEM_STOP_TO_FAILURE_RATIO;
		final long earliestRuntimeMs;

		if (backoffAttempts == 0) {
		earliestRuntimeMs = JobStatus.NO_EARLIEST_RUNTIME;
		} else {
		long delayMillis;
		switch (job.getBackoffPolicy()) {
		case JobInfo.BACKOFF_POLICY_LINEAR: {
		long backoff = initialBackoffMillis;
		@@ -2611,23 +2615,28 @@ public class JobSchedulerService extends com.android.server.SystemService
		backoff = mConstants.MIN_LINEAR_BACKOFF_TIME_MS;
		}
		delayMillis = backoff * backoffAttempts;
		} break;
		}
		break;
		default:
		if (DEBUG) {
		Slog.v(TAG, "Unrecognised back-off policy, defaulting to exponential.");
		}
		// Intentional fallthrough.
		case JobInfo.BACKOFF_POLICY_EXPONENTIAL: {
		long backoff = initialBackoffMillis;
		if (backoff < mConstants.MIN_EXP_BACKOFF_TIME_MS) {
		backoff = mConstants.MIN_EXP_BACKOFF_TIME_MS;
		}
		delayMillis = (long) Math.scalb(backoff, backoffAttempts - 1);
		} break;
		}
		break;
		}
		delayMillis =
		Math.min(delayMillis, JobInfo.MAX_BACKOFF_DELAY_MILLIS);
		earliestRuntimeMs = elapsedNowMillis + delayMillis;
		}
		JobStatus newJob = new JobStatus(failureToReschedule,
		elapsedNowMillis + delayMillis,
		earliestRuntimeMs,
		JobStatus.NO_LATEST_RUNTIME, numFailures, numSystemStops,
		failureToReschedule.getLastSuccessfulRunTime(), sSystemClock.millis(),
		failureToReschedule.getCumulativeExecutionTimeMs());

core/api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -4156,6 +4156,7 @@ package android.window {
		public static class WindowInfosListenerForTest.WindowInfo {
		field @NonNull public final android.graphics.Rect bounds;
		field public final boolean isTrustedOverlay;
		field public final boolean isVisible;
		field @NonNull public final String name;
		field @NonNull public final android.os.IBinder windowToken;
		}

core/java/android/app/ForegroundServiceTypePolicy.java

+117 −42

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.app;

		import static android.app.AppOpsManager.MODE_ALLOWED;
		import static android.app.AppOpsManager.MODE_DEFAULT;
		import static android.app.AppOpsManager.MODE_FOREGROUND;
		import static android.app.AppOpsManager.MODE_IGNORED;
		import static android.content.pm.PackageManager.PERMISSION_DENIED;
		@@ -37,6 +38,8 @@ import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_REMOTE_MESS
		import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE;
		import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE;
		import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED;
		import static android.permission.PermissionCheckerManager.PERMISSION_HARD_DENIED;
		import static android.permission.PermissionCheckerManager.PERMISSION_SOFT_DENIED;

		import android.Manifest;
		import android.annotation.IntDef;
		@@ -268,7 +271,8 @@ public abstract class ForegroundServiceTypePolicy {
		null /* allOfPermissions */,
		null /* anyOfPermissions */,
		null /* permissionEnforcementFlag */,
		false /* permissionEnforcementFlagDefaultValue */
		false /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -284,7 +288,8 @@ public abstract class ForegroundServiceTypePolicy {
		null /* allOfPermissions */,
		null /* anyOfPermissions */,
		null /* permissionEnforcementFlag */,
		false /* permissionEnforcementFlagDefaultValue */
		false /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -302,7 +307,8 @@ public abstract class ForegroundServiceTypePolicy {
		}, true),
		null /* anyOfPermissions */,
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_DATA_SYNC /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -320,7 +326,8 @@ public abstract class ForegroundServiceTypePolicy {
		}, true),
		null /* anyOfPermissions */,
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_MEDIA_PLAYBACK /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -341,7 +348,8 @@ public abstract class ForegroundServiceTypePolicy {
		new RolePermission(RoleManager.ROLE_DIALER)
		}, false),
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_PHONE_CALL /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -362,7 +370,8 @@ public abstract class ForegroundServiceTypePolicy {
		new RegularPermission(Manifest.permission.ACCESS_FINE_LOCATION),
		}, false),
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_LOCATION /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		true /* foregroundOnlyPermission */
		);

		/**
		@@ -392,7 +401,8 @@ public abstract class ForegroundServiceTypePolicy {
		new UsbAccessoryPermission(),
		}, false),
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_CONNECTED_DEVICE /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -413,7 +423,8 @@ public abstract class ForegroundServiceTypePolicy {
		new AppOpPermission(AppOpsManager.OP_PROJECT_MEDIA)
		}, false),
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_MEDIA_PROJECTION /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -434,7 +445,8 @@ public abstract class ForegroundServiceTypePolicy {
		new RegularPermission(Manifest.permission.SYSTEM_CAMERA),
		}, false),
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_CAMERA /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		true /* foregroundOnlyPermission */
		);

		/**
		@@ -459,7 +471,8 @@ public abstract class ForegroundServiceTypePolicy {
		new RegularPermission(Manifest.permission.RECORD_AUDIO),
		}, false),
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_MICROPHONE /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		true /* foregroundOnlyPermission */
		);

		/**
		@@ -481,7 +494,8 @@ public abstract class ForegroundServiceTypePolicy {
		new RegularPermission(Manifest.permission.HIGH_SAMPLING_RATE_SENSORS),
		}, false),
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_HEALTH /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -499,7 +513,8 @@ public abstract class ForegroundServiceTypePolicy {
		}, true),
		null /* anyOfPermissions */,
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_REMOTE_MESSAGING /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -521,7 +536,8 @@ public abstract class ForegroundServiceTypePolicy {
		new AppOpPermission(AppOpsManager.OP_ACTIVATE_VPN),
		}, false),
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_SYSTEM_EXEMPTED /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -537,7 +553,8 @@ public abstract class ForegroundServiceTypePolicy {
		null /* allOfPermissions */,
		null /* anyOfPermissions */,
		null /* permissionEnforcementFlag */,
		false /* permissionEnforcementFlagDefaultValue */
		false /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -555,7 +572,8 @@ public abstract class ForegroundServiceTypePolicy {
		}, true),
		null /* anyOfPermissions */,
		null /* permissionEnforcementFlag */,
		false /* permissionEnforcementFlagDefaultValue */
		false /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -573,7 +591,8 @@ public abstract class ForegroundServiceTypePolicy {
		}, true),
		null /* anyOfPermissions */,
		FGS_TYPE_PERM_ENFORCEMENT_FLAG_SPECIAL_USE /* permissionEnforcementFlag */,
		true /* permissionEnforcementFlagDefaultValue */
		true /* permissionEnforcementFlagDefaultValue */,
		false /* foregroundOnlyPermission */
		);

		/**
		@@ -640,6 +659,29 @@ public abstract class ForegroundServiceTypePolicy {
		@Retention(RetentionPolicy.SOURCE)
		public @interface ForegroundServicePolicyCheckCode{}

		/**
		* Whether or not to require that app to have actual access to certain foreground only
		* permissions before starting the foreground service.
		*
		* <p>
		* Examples here are microphone, camera and fg location related permissions.
		* When the user grants the permission, its permission state is set to "granted",
		* but the actual capability to access these sensors, is to be evaluated according to
		* its process state. The Android {@link android.os.Build.VERSION_CODES#R} introduced
		* the while-in-use permission, basically the background-started FGS will not have access
		* to these sensors. In this context, there is no legitimate reasons to start a FGS from
		* the background with these types. This flag controls the behavior of the enforcement,
		* when it's enabled, in the aforementioned case, the FGS start will result in
		* a SecurityException. </p>
		*/
		private static final String FGS_TYPE_FG_PERM_ENFORCEMENT_FLAG =
		"fgs_type_fg_perm_enforcement_flag";

		/**
		* The default value to the {@link #FGS_TYPE_FG_PERM_ENFORCEMENT_FLAG}.
		*/
		private static final boolean DEFAULT_FGS_TYPE_FG_PERM_ENFORCEMENT_FLAG_VALUE = true;

		/**
		* @return The policy info for the given type.
		*/
		@@ -682,6 +724,11 @@ public abstract class ForegroundServiceTypePolicy {
		}
		}

		private static boolean isFgsTypeFgPermissionEnforcementEnabled() {
		return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
		FGS_TYPE_FG_PERM_ENFORCEMENT_FLAG, DEFAULT_FGS_TYPE_FG_PERM_ENFORCEMENT_FLAG_VALUE);
		}

		/**
		* Constructor.
		*
		@@ -738,6 +785,12 @@ public abstract class ForegroundServiceTypePolicy {
		*/
		final boolean mPermissionEnforcementFlagDefaultValue;

		/**
		* Whether or not the permissions here are limited to foreground only.
		* Typical examples are microphone/camera/location.
		*/
		final boolean mForegroundOnlyPermission;

		/**
		* A customized check for the permissions.
		*/
		@@ -774,7 +827,8 @@ public abstract class ForegroundServiceTypePolicy {
		@Nullable ForegroundServiceTypePermissions allOfPermissions,
		@Nullable ForegroundServiceTypePermissions anyOfPermissions,
		@Nullable String permissionEnforcementFlag,
		boolean permissionEnforcementFlagDefaultValue) {
		boolean permissionEnforcementFlagDefaultValue,
		boolean foregroundOnlyPermission) {
		mType = type;
		mDeprecationChangeId = deprecationChangeId;
		mDisabledChangeId = disabledChangeId;
		@@ -783,6 +837,7 @@ public abstract class ForegroundServiceTypePolicy {
		mPermissionEnforcementFlag = permissionEnforcementFlag;
		mPermissionEnforcementFlagDefaultValue = permissionEnforcementFlagDefaultValue;
		mPermissionEnforcementFlagValue = permissionEnforcementFlagDefaultValue;
		mForegroundOnlyPermission = foregroundOnlyPermission;
		}

		/**
		@@ -884,6 +939,14 @@ public abstract class ForegroundServiceTypePolicy {
		&& CompatChanges.isChangeEnabled(mDisabledChangeId, callerUid);
		}

		/**
		* Whether or not the permissions here are limited to foreground only.
		* Typical examples are microphone/camera/location.
		*/
		public boolean hasForegroundOnlyPermission() {
		return mForegroundOnlyPermission;
		}

		/**
		* Override the type disabling change Id.
		*
		@@ -1082,35 +1145,47 @@ public abstract class ForegroundServiceTypePolicy {
		@PackageManager.PermissionResult
		int checkPermission(@NonNull Context context, @NonNull String name, int callerUid,
		int callerPid, String packageName, boolean allowWhileInUse) {
		// Simple case, check if it's already granted.
		@PermissionCheckerManager.PermissionResult int result;
		if ((result = PermissionChecker.checkPermissionForPreflight(context, name, callerPid,
		callerUid, packageName)) == PermissionCheckerManager.PERMISSION_GRANTED) {
		return PERMISSION_GRANTED;
		@PermissionCheckerManager.PermissionResult final int result =
		PermissionChecker.checkPermissionForPreflight(context, name,
		callerPid, callerUid, packageName);
		if (result == PERMISSION_HARD_DENIED) {
		// If the user didn't grant this permission at all.
		return PERMISSION_DENIED;
		}
		if (allowWhileInUse && result == PermissionCheckerManager.PERMISSION_SOFT_DENIED) {
		// Check its appops
		final int opCode = AppOpsManager.permissionToOpCode(name);
		if (opCode == AppOpsManager.OP_NONE) {
		// Simple case, check if it's already granted.
		return result == PermissionCheckerManager.PERMISSION_GRANTED
		? PERMISSION_GRANTED : PERMISSION_DENIED;
		}
		final AppOpsManager appOpsManager = context.getSystemService(AppOpsManager.class);
		if (opCode != AppOpsManager.OP_NONE) {
		final int currentMode = appOpsManager.unsafeCheckOpRawNoThrow(opCode, callerUid,
		packageName);
		if (currentMode == MODE_FOREGROUND) {
		// It's in foreground only mode and we're allowing while-in-use.
		final int mode = appOpsManager.unsafeCheckOpRawNoThrow(opCode, callerUid, packageName);
		switch (mode) {
		case MODE_ALLOWED:
		// The appop is just allowed, plain and simple.
		return PERMISSION_GRANTED;
		} else if (currentMode == MODE_IGNORED) {
		case MODE_DEFAULT:
		// Follow the permission check result.
		return result == PermissionCheckerManager.PERMISSION_GRANTED
		? PERMISSION_GRANTED : PERMISSION_DENIED;
		case MODE_FOREGROUND:
		// If the enforcement flag is OFF, we silently allow it. Or, if it's in
		// the foreground only mode and we're allowing while-in-use, allow it.
		return !isFgsTypeFgPermissionEnforcementEnabled() \|\| allowWhileInUse
		? PERMISSION_GRANTED : PERMISSION_DENIED;
		case MODE_IGNORED:
		// If it's soft denied with the mode "ignore", semantically it's a silent
		// failure and no exception should be thrown, we might not want to allow
		// the FGS. However, since the user has agreed with this permission
		// (otherwise it's going to be a hard denial), and we're allowing
		// while-in-use here, it's safe to allow the FGS run here.
		return PERMISSION_GRANTED;
		}
		}
		}
		return allowWhileInUse && result == PERMISSION_SOFT_DENIED
		? PERMISSION_GRANTED : PERMISSION_DENIED;
		default:
		return PERMISSION_DENIED;
		}
		}
		}

		/**
		* This represents an app op permission to be required for a specific service type.

core/java/android/app/admin/DevicePolicyManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -15735,7 +15735,7 @@ public class DevicePolicyManager {
		throwIfParentInstance("getAllCrossProfilePackages");
		if (mService != null) {
		try {
		return new ArraySet<>(mService.getAllCrossProfilePackages());
		return new ArraySet<>(mService.getAllCrossProfilePackages(mContext.getUserId()));
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}