Snap for 12140224 from 800131b160d87ff834fa3fcc8e4c866d0d74ef75 to 24Q4-release (88ff584b) · Commits · e / os / android_frameworks_base

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

+0 −28

Original line number	Diff line number	Diff line
		@@ -116,7 +116,6 @@ import android.os.ServiceManager;
		import android.os.ShellCallback;
		import android.os.ShellCommand;
		import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.ThreadLocalWorkSource;
		import android.os.Trace;
		import android.os.UserHandle;
		@@ -179,9 +178,6 @@ import java.io.PrintWriter;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.text.SimpleDateFormat;
		import java.time.Instant;
		import java.time.zone.ZoneOffsetTransition;
		import java.time.zone.ZoneRules;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Calendar;
		@@ -193,7 +189,6 @@ import java.util.Set;
		import java.util.TimeZone;
		import java.util.TreeSet;
		import java.util.concurrent.ThreadLocalRandom;
		import java.util.concurrent.TimeUnit;
		import java.util.function.Predicate;

		/**
		@@ -233,13 +228,6 @@ public class AlarmManagerService extends SystemService {

		private static final long TEMPORARY_QUOTA_DURATION = INTERVAL_DAY;

		// System properties read on some device configurations to initialize time properly and
		// perform DST transitions at the bootloader level.
		private static final String TIMEOFFSET_PROPERTY = "persist.sys.time.offset";
		private static final String DST_TRANSITION_PROPERTY = "persist.sys.time.dst_transition";
		private static final String DST_OFFSET_PROPERTY = "persist.sys.time.dst_offset";


		private final Intent mBackgroundIntent
		= new Intent().addFlags(Intent.FLAG_FROM_BACKGROUND);

		@@ -2127,22 +2115,6 @@ public class AlarmManagerService extends SystemService {
		// "GMT" if the ID is unrecognized). The parameter ID is used here rather than
		// newZone.getId(). It will be rejected if it is invalid.
		timeZoneWasChanged = SystemTimeZone.setTimeZoneId(tzId, confidence, logInfo);

		final int gmtOffset = newZone.getOffset(mInjector.getCurrentTimeMillis());
		SystemProperties.set(TIMEOFFSET_PROPERTY, String.valueOf(gmtOffset));

		final ZoneRules rules = newZone.toZoneId().getRules();
		final ZoneOffsetTransition transition = rules.nextTransition(Instant.now());
		if (null != transition) {
		// Get the offset between the time after the DST transition and before.
		final long transitionOffset = TimeUnit.SECONDS.toMillis((
		transition.getOffsetAfter().getTotalSeconds()
		- transition.getOffsetBefore().getTotalSeconds()));
		// Time when the next DST transition is programmed.
		final long nextTransition = TimeUnit.SECONDS.toMillis(transition.toEpochSecond());
		SystemProperties.set(DST_TRANSITION_PROPERTY, String.valueOf(nextTransition));
		SystemProperties.set(DST_OFFSET_PROPERTY, String.valueOf(transitionOffset));
		}
		}

		// Clear the default time zone in the system server process. This forces the next call

core/java/android/content/pm/multiuser.aconfig

+12 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,18 @@ flag {
		}
		}

		flag {
		name: "cache_user_serial_number_read_only"
		namespace: "multiuser"
		description: "Optimise user serial number retrieval. Read only flag, so that it can be used before the flags are initialized."
		bug: "353134536"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		is_fixed_read_only: true
		}


		# This flag guards the private space feature and all its implementations excluding the APIs. APIs are guarded by android.os.Flags.allow_private_profile.
		flag {
		name: "enable_private_space_features"

core/java/android/hardware/input/VirtualKeyEvent.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,10 @@ public final class VirtualKeyEvent implements Parcelable {
		* obtained from {@link SystemClock#uptimeMillis()} (with nanosecond precision instead of
		* millisecond), but can be different depending on the use case.
		* This field is optional and can be omitted.
		* <p>
		* If this field is unset, then the time at which this event is sent to the framework would
		* be considered as the event time (even though
		* {@link VirtualKeyEvent#getEventTimeNanos()}) would return {@code 0L}).
		*
		* @return this builder, to allow for chaining of calls
		* @see InputEvent#getEventTime()

core/java/android/hardware/input/VirtualMouseButtonEvent.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -197,6 +197,10 @@ public final class VirtualMouseButtonEvent implements Parcelable {
		* obtained from {@link SystemClock#uptimeMillis()} (with nanosecond precision instead of
		* millisecond), but can be different depending on the use case.
		* This field is optional and can be omitted.
		* <p>
		* If this field is unset, then the time at which this event is sent to the framework would
		* be considered as the event time (even though
		* {@link VirtualMouseButtonEvent#getEventTimeNanos()}) would return {@code 0L}).
		*
		* @return this builder, to allow for chaining of calls
		* @see InputEvent#getEventTime()

core/java/android/hardware/input/VirtualMouseRelativeEvent.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,10 @@ public final class VirtualMouseRelativeEvent implements Parcelable {
		* obtained from {@link SystemClock#uptimeMillis()} (with nanosecond precision instead of
		* millisecond), but can be different depending on the use case.
		* This field is optional and can be omitted.
		* <p>
		* If this field is unset, then the time at which this event is sent to the framework would
		* be considered as the event time (even though
		* {@link VirtualMouseRelativeEvent#getEventTimeNanos()}) would return {@code 0L}).
		*
		* @return this builder, to allow for chaining of calls
		* @see InputEvent#getEventTime()