Snap for 12224018 from 472a340b3ea0140cc02f28ab7ab335f56d1526af to 24Q4-release (c50afc7c) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/aconfig/job.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -48,3 +48,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "create_work_chain_by_default"
		namespace: "backstage_power"
		description: "Create a workchain by default when acquiring a wakelock"
		bug: "352676818"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -319,7 +319,7 @@ public class AlarmManagerService extends SystemService {
		*/
		int mSystemUiUid;

		static boolean isTimeTickAlarm(Alarm a) {
		private static boolean isTimeTickAlarm(Alarm a) {
		return a.uid == Process.SYSTEM_UID && TIME_TICK_TAG.equals(a.listenerTag);
		}

		@@ -3955,6 +3955,9 @@ public class AlarmManagerService extends SystemService {
		if (!RemovedAlarm.isLoggable(reason)) {
		continue;
		}
		if (isTimeTickAlarm(removed)) {
		Slog.wtf(TAG, "Removed TIME_TICK alarm");
		}
		RingBuffer<RemovedAlarm> bufferForUid = mRemovalHistory.get(removed.uid);
		if (bufferForUid == null) {
		bufferForUid = new RingBuffer<>(RemovedAlarm.class, REMOVAL_HISTORY_SIZE_PER_UID);

+0 −7

Original line number	Diff line number	Diff line
		@@ -17,11 +17,9 @@
		package com.android.server.alarm;

		import static com.android.server.alarm.AlarmManagerService.dumpAlarmList;
		import static com.android.server.alarm.AlarmManagerService.isTimeTickAlarm;

		import android.app.AlarmManager;
		import android.util.IndentingPrintWriter;
		import android.util.Slog;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -88,11 +86,6 @@ public class LazyAlarmStore implements AlarmStore {
		if (removed.alarmClock != null && mOnAlarmClockRemoved != null) {
		mOnAlarmClockRemoved.run();
		}
		if (isTimeTickAlarm(removed)) {
		// This code path is not invoked when delivering alarms, only when removing
		// alarms due to the caller cancelling it or getting uninstalled, etc.
		Slog.wtf(TAG, "Removed TIME_TICK alarm");
		}
		removedAlarms.add(removed);
		}
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -1617,10 +1617,11 @@ public class JobSchedulerService extends com.android.server.SystemService

		@NonNull
		public WorkSource deriveWorkSource(int sourceUid, @Nullable String sourcePackageName) {
		if (WorkSource.isChainedBatteryAttributionEnabled(getContext())) {
		if (Flags.createWorkChainByDefault()
		\|\| WorkSource.isChainedBatteryAttributionEnabled(getContext())) {
		WorkSource ws = new WorkSource();
		ws.createWorkChain()
		.addNode(sourceUid, sourcePackageName)
		.addNode(sourceUid, null)
		.addNode(Process.SYSTEM_UID, "JobScheduler");
		return ws;
		} else {

+1 −12

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "FrameworksCoreTests",
		"options": [
		{
		"include-filter": "android.view.inputmethod"
		},
		{
		"include-filter": "com.android.internal.inputmethod"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		],
		"name": "FrameworksCoreTests_inputmethod",
		"file_patterns": [
		"core/java/com/android/internal/inputmethod/.*",
		"core/java/android/view/inputmethod/.*",