Snap for 7550575 from 6cc2381562e792f9033dd1b941d2737c52ccbdb7 to sc-release (0cf0aea0) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+26 −7

Original line number	Diff line number	Diff line
		@@ -256,6 +256,7 @@ public class AlarmManagerService extends SystemService {
		AlarmHandler mHandler;
		AppWakeupHistory mAppWakeupHistory;
		AppWakeupHistory mAllowWhileIdleHistory;
		AppWakeupHistory mAllowWhileIdleCompatHistory;
		private final SparseLongArray mLastPriorityAlarmDispatch = new SparseLongArray();
		private final SparseArray<RingBuffer<RemovedAlarm>> mRemovalHistory = new SparseArray<>();
		ClockReceiver mClockReceiver;
		@@ -1633,6 +1634,7 @@ public class AlarmManagerService extends SystemService {

		mAppWakeupHistory = new AppWakeupHistory(Constants.DEFAULT_APP_STANDBY_WINDOW);
		mAllowWhileIdleHistory = new AppWakeupHistory(INTERVAL_HOUR);
		mAllowWhileIdleCompatHistory = new AppWakeupHistory(INTERVAL_HOUR);

		mNextWakeup = mNextNonWakeup = 0;

		@@ -2142,20 +2144,23 @@ public class AlarmManagerService extends SystemService {
		final int userId = UserHandle.getUserId(alarm.creatorUid);
		final int quota;
		final long window;
		final AppWakeupHistory history;
		if ((alarm.flags & FLAG_ALLOW_WHILE_IDLE) != 0) {
		quota = mConstants.ALLOW_WHILE_IDLE_QUOTA;
		window = mConstants.ALLOW_WHILE_IDLE_WINDOW;
		history = mAllowWhileIdleHistory;
		} else {
		quota = mConstants.ALLOW_WHILE_IDLE_COMPAT_QUOTA;
		window = mConstants.ALLOW_WHILE_IDLE_COMPAT_WINDOW;
		history = mAllowWhileIdleCompatHistory;
		}
		final int dispatchesInWindow = mAllowWhileIdleHistory.getTotalWakeupsInWindow(
		final int dispatchesInHistory = history.getTotalWakeupsInWindow(
		alarm.sourcePackage, userId);
		if (dispatchesInWindow < quota) {
		if (dispatchesInHistory < quota) {
		// fine to go out immediately.
		batterySaverPolicyElapsed = nowElapsed;
		} else {
		batterySaverPolicyElapsed = mAllowWhileIdleHistory.getNthLastWakeupForPackage(
		batterySaverPolicyElapsed = history.getNthLastWakeupForPackage(
		alarm.sourcePackage, userId, quota) + window;
		}
		} else if ((alarm.flags & FLAG_PRIORITIZE) != 0) {
		@@ -2201,20 +2206,23 @@ public class AlarmManagerService extends SystemService {
		final int userId = UserHandle.getUserId(alarm.creatorUid);
		final int quota;
		final long window;
		final AppWakeupHistory history;
		if ((alarm.flags & FLAG_ALLOW_WHILE_IDLE) != 0) {
		quota = mConstants.ALLOW_WHILE_IDLE_QUOTA;
		window = mConstants.ALLOW_WHILE_IDLE_WINDOW;
		history = mAllowWhileIdleHistory;
		} else {
		quota = mConstants.ALLOW_WHILE_IDLE_COMPAT_QUOTA;
		window = mConstants.ALLOW_WHILE_IDLE_COMPAT_WINDOW;
		history = mAllowWhileIdleCompatHistory;
		}
		final int dispatchesInWindow = mAllowWhileIdleHistory.getTotalWakeupsInWindow(
		final int dispatchesInHistory = history.getTotalWakeupsInWindow(
		alarm.sourcePackage, userId);
		if (dispatchesInWindow < quota) {
		if (dispatchesInHistory < quota) {
		// fine to go out immediately.
		deviceIdlePolicyTime = nowElapsed;
		} else {
		final long whenInQuota = mAllowWhileIdleHistory.getNthLastWakeupForPackage(
		final long whenInQuota = history.getNthLastWakeupForPackage(
		alarm.sourcePackage, userId, quota) + window;
		deviceIdlePolicyTime = Math.min(whenInQuota, mPendingIdleUntil.getWhenElapsed());
		}
		@@ -2502,6 +2510,7 @@ public class AlarmManagerService extends SystemService {
		Binder.getCallingPid(), callingUid, "AlarmManager.setPrioritized");
		// The API doesn't allow using both together.
		flags &= ~FLAG_ALLOW_WHILE_IDLE;
		// Prioritized alarms don't need any extra permission to be exact.
		} else if (exact \|\| allowWhileIdle) {
		final boolean needsPermission;
		boolean lowerQuota;
		@@ -2992,6 +3001,10 @@ public class AlarmManagerService extends SystemService {
		mAllowWhileIdleHistory.dump(pw, nowELAPSED);
		pw.println();

		pw.println("Allow while idle compat history:");
		mAllowWhileIdleCompatHistory.dump(pw, nowELAPSED);
		pw.println();

		if (mLastPriorityAlarmDispatch.size() > 0) {
		pw.println("Last priority alarm dispatches:");
		pw.increaseIndent();
		@@ -4553,6 +4566,7 @@ public class AlarmManagerService extends SystemService {
		removeUserLocked(userHandle);
		mAppWakeupHistory.removeForUser(userHandle);
		mAllowWhileIdleHistory.removeForUser(userHandle);
		mAllowWhileIdleCompatHistory.removeForUser(userHandle);
		}
		return;
		case Intent.ACTION_UID_REMOVED:
		@@ -4588,6 +4602,8 @@ public class AlarmManagerService extends SystemService {
		// package-removed and package-restarted case
		mAppWakeupHistory.removeForPackage(pkg, UserHandle.getUserId(uid));
		mAllowWhileIdleHistory.removeForPackage(pkg, UserHandle.getUserId(uid));
		mAllowWhileIdleCompatHistory.removeForPackage(pkg,
		UserHandle.getUserId(uid));
		removeLocked(uid, REMOVE_REASON_UNDEFINED);
		} else {
		// external-applications-unavailable case
		@@ -4965,7 +4981,10 @@ public class AlarmManagerService extends SystemService {
		if (isAllowedWhileIdleRestricted(alarm)) {
		// Record the last time this uid handled an ALLOW_WHILE_IDLE alarm while the
		// device was in doze or battery saver.
		mAllowWhileIdleHistory.recordAlarmForPackage(alarm.sourcePackage,
		final AppWakeupHistory history = ((alarm.flags & FLAG_ALLOW_WHILE_IDLE) != 0)
		? mAllowWhileIdleHistory
		: mAllowWhileIdleCompatHistory;
		history.recordAlarmForPackage(alarm.sourcePackage,
		UserHandle.getUserId(alarm.creatorUid), nowELAPSED);
		mAlarmStore.updateAlarmDeliveries(a -> {
		if (a.creatorUid != alarm.creatorUid \|\| !isAllowedWhileIdleRestricted(a)) {

apex/jobscheduler/service/java/com/android/server/job/restrictions/ThermalStatusRestriction.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public class ThermalStatusRestriction extends JobRestriction {

		@Override
		public boolean isJobRestricted(JobStatus job) {
		return mIsThermalRestricted && job.hasConnectivityConstraint();
		return mIsThermalRestricted;
		}

		@Override

core/java/android/hardware/ISensorPrivacyManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,6 @@ interface ISensorPrivacyManager {
		void setIndividualSensorPrivacyForProfileGroup(int userId, int source, int sensor, boolean enable);
		// =============== End of transactions used on native side as well ============================

		void suppressIndividualSensorPrivacyReminders(int userId, String packageName, IBinder token,
		void suppressIndividualSensorPrivacyReminders(int userId, int sensor, IBinder token,
		boolean suppress);
		}
		No newline at end of file

core/java/android/hardware/SensorPrivacyManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -461,9 +461,9 @@ public final class SensorPrivacyManager {
		* @hide
		*/
		@RequiresPermission(Manifest.permission.MANAGE_SENSOR_PRIVACY)
		public void suppressSensorPrivacyReminders(@NonNull String packageName,
		public void suppressSensorPrivacyReminders(int sensor,
		boolean suppress) {
		suppressSensorPrivacyReminders(packageName, suppress, mContext.getUserId());
		suppressSensorPrivacyReminders(sensor, suppress, mContext.getUserId());
		}

		/**
		@@ -476,10 +476,10 @@ public final class SensorPrivacyManager {
		* @hide
		*/
		@RequiresPermission(Manifest.permission.MANAGE_SENSOR_PRIVACY)
		public void suppressSensorPrivacyReminders(@NonNull String packageName,
		public void suppressSensorPrivacyReminders(int sensor,
		boolean suppress, @UserIdInt int userId) {
		try {
		mService.suppressIndividualSensorPrivacyReminders(userId, packageName,
		mService.suppressIndividualSensorPrivacyReminders(userId, sensor,
		token, suppress);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();

core/java/android/hardware/location/ContextHubClientCallback.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -68,8 +68,11 @@ public class ContextHubClientCallback {

		/**
		* Callback invoked when a nanoapp is dynamically loaded at the attached Context Hub through
		* the {@link android.hardware.location.ContextHubManager}. This callback is not invoked for a
		* nanoapp that is loaded internally by CHRE (e.g. nanoapps that are preloaded by the system).
		* the {@link android.hardware.location.ContextHubManager}.
		*
		* NOTE: This callback is <b>not</b> invoked for a nanoapp that is loaded internally by CHRE
		* (e.g. nanoapps that are preloaded by the system). To check the availability of these
		* nanoapps, use the {@link ContextHubManager#queryNanoApps(ContextHubInfo)} API.
		*
		* @param client the client that is associated with this callback
		* @param nanoAppId the ID of the nanoapp that had been loaded