Snap for 13436862 from c2d71886db10688bbbb5e1750406c8d22c880a53 to 25Q3-release (4a4c8f41) · Commits · e / os / android_frameworks_base

OWNERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ dsandler@android.com #{LAST_RESORT_SUGGESTION}
		dsandler@google.com #{LAST_RESORT_SUGGESTION}
		hackbod@android.com #{LAST_RESORT_SUGGESTION}
		hackbod@google.com #{LAST_RESORT_SUGGESTION}
		jham@google.com #{LAST_RESORT_SUGGESTION}
		jjaggi@google.com #{LAST_RESORT_SUGGESTION}
		lorenzo@google.com #{LAST_RESORT_SUGGESTION}
		michaelwr@google.com #{LAST_RESORT_SUGGESTION}

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -498,6 +498,8 @@ public final class JobServiceContext implements ServiceConnection {
		Slog.d(TAG, job.getServiceComponent().getShortClassName() + " unavailable.");
		}
		mContext.unbindService(this);
		// Ensure this occurs while mRunningCallback is still set.
		removeOpTimeOutLocked();
		mRunningJob = null;
		mRunningJobWorkType = WORK_TYPE_NONE;
		mRunningCallback = null;
		@@ -505,7 +507,6 @@ public final class JobServiceContext implements ServiceConnection {
		mExecutionStartTimeElapsed = 0L;
		mWakeLock.release();
		mVerb = VERB_FINISHED;
		removeOpTimeOutLocked();
		return false;
		}
		mJobPackageTracker.noteActive(job);
		@@ -1213,6 +1214,8 @@ public final class JobServiceContext implements ServiceConnection {
		handleOpTimeoutLocked();
		} else {
		JobCallback jc = (JobCallback)message.obj;
		// This is an unknown JobCallback. It may, or may not, have an
		// associated timer.
		mAnrTimer.discard(jc);
		StringBuilder sb = new StringBuilder(128);
		sb.append("Ignoring timeout of no longer active job");
		@@ -1765,6 +1768,8 @@ public final class JobServiceContext implements ServiceConnection {
		}
		final int workType = mRunningJobWorkType;
		mContext.unbindService(JobServiceContext.this);
		// Ensure this occurs while mRunningCallback is still set.
		removeOpTimeOutLocked();
		mWakeLock = null;
		mRunningJob = null;
		mRunningJobWorkType = WORK_TYPE_NONE;
		@@ -1782,7 +1787,6 @@ public final class JobServiceContext implements ServiceConnection {
		mPendingInternalStopReason = 0;
		mPendingDebugStopReason = null;
		mPendingNetworkChange = null;
		removeOpTimeOutLocked();
		if (completedJob.isUserVisibleJob()) {
		mService.informObserversOfUserVisibleJobChange(this, completedJob, false);
		}

cmds/incidentd/OWNERS

+0 −1

Original line number	Diff line number	Diff line
		joeo@google.com
		yaochen@google.com
		yanmin@google.com

core/TEST_MAPPING

+7 −0

Original line number	Diff line number	Diff line
		@@ -9,5 +9,12 @@
		"core/tests/coretests/src/com/android/internal/inputmethod/.*"
		]
		}
		],
		"wear-robolectric-postsubmit": [
		{
		"name": "ClockworkSettingsRoboTests",
		"host": true
		}
		]

		}

core/api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -6529,6 +6529,7 @@ package android.app {
		method public long getTimeoutAfter();
		method public boolean hasImage();
		method @FlaggedApi("android.app.api_rich_ongoing") public boolean hasPromotableCharacteristics();
		method @FlaggedApi("android.app.opt_in_rich_ongoing") public boolean hasRequestedPromotedOngoing();
		method @FlaggedApi("android.app.nm_summarization") public boolean hasSummarizedContent();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT;
		@@ -6850,6 +6851,7 @@ package android.app {
		method @NonNull public android.app.Notification.Builder setProgress(int, int, boolean);
		method @NonNull public android.app.Notification.Builder setPublicVersion(android.app.Notification);
		method @NonNull public android.app.Notification.Builder setRemoteInputHistory(CharSequence[]);
		method @FlaggedApi("android.app.opt_in_rich_ongoing") @NonNull public android.app.Notification.Builder setRequestPromotedOngoing(boolean);
		method @NonNull public android.app.Notification.Builder setSettingsText(CharSequence);
		method @FlaggedApi("android.app.api_rich_ongoing") @NonNull public android.app.Notification.Builder setShortCriticalText(@Nullable String);
		method @NonNull public android.app.Notification.Builder setShortcutId(String);