Snap for 11859356 from 9cd4cf53a9dc731ea6bf4c5f21713105b109b5e6 to 24Q3-release (80b1668f) · Commits · e / os / android_frameworks_base

apex/jobscheduler/framework/java/android/app/job/JobInfo.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SuppressLint;
		import android.app.Notification;
		import android.compat.Compatibility;
		import android.compat.annotation.ChangeId;
		@@ -1366,6 +1367,7 @@ public class JobInfo implements Parcelable {
		* @return This object for method chaining
		*/
		@FlaggedApi(Flags.FLAG_JOB_DEBUG_INFO_APIS)
		@SuppressLint("BuilderSetStyle")
		@NonNull
		public Builder removeDebugTag(@NonNull String tag) {
		mDebugTags.remove(tag);

api/StubLibraries.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ non_updatable_exportable_droidstubs {
		},
		api_lint: {
		enabled: true,
		new_since: ":android.api.public.latest",
		new_since: ":android.api.combined.public.latest",
		baseline_file: ":non-updatable-lint-baseline.txt",
		},
		},
		@@ -130,7 +130,7 @@ non_updatable_exportable_droidstubs {
		},
		api_lint: {
		enabled: true,
		new_since: ":android.api.system.latest",
		new_since: ":android.api.combined.system.latest",
		baseline_file: ":non-updatable-system-lint-baseline.txt",
		},
		},
		@@ -185,7 +185,7 @@ non_updatable_exportable_droidstubs {
		},
		api_lint: {
		enabled: true,
		new_since: ":android.api.test.latest",
		new_since: ":android.api.combined.test.latest",
		baseline_file: ":non-updatable-test-lint-baseline.txt",
		},
		},
		@@ -269,7 +269,7 @@ non_updatable_exportable_droidstubs {
		},
		api_lint: {
		enabled: true,
		new_since: ":android.api.module-lib.latest",
		new_since: ":android.api.combined.module-lib.latest",
		baseline_file: ":non-updatable-module-lib-lint-baseline.txt",
		},
		},

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -26592,7 +26592,7 @@ package android.media.session {
		method public long getFlags();
		method @Nullable public android.media.MediaMetadata getMetadata();
		method public String getPackageName();
		method @Nullable public android.media.session.MediaController.PlaybackInfo getPlaybackInfo();
		method @NonNull public android.media.session.MediaController.PlaybackInfo getPlaybackInfo();
		method @Nullable public android.media.session.PlaybackState getPlaybackState();
		method @Nullable public java.util.List<android.media.session.MediaSession.QueueItem> getQueue();
		method @Nullable public CharSequence getQueueTitle();

core/api/test-current.txt

+7 −2

Original line number	Diff line number	Diff line
		@@ -4260,6 +4260,12 @@ package android.window {
		field @NonNull public static final android.os.Parcelable.Creator<android.window.TaskFragmentOrganizerToken> CREATOR;
		}

		public final class TaskFragmentParentInfo implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.window.TaskFragmentParentInfo> CREATOR;
		}

		public final class TaskFragmentTransaction implements android.os.Parcelable {
		ctor public TaskFragmentTransaction();
		method public void addChange(@Nullable android.window.TaskFragmentTransaction.Change);
		@@ -4284,8 +4290,8 @@ package android.window {
		method @Nullable public android.os.IBinder getActivityToken();
		method @NonNull public android.os.Bundle getErrorBundle();
		method @Nullable public android.os.IBinder getErrorCallbackToken();
		method @Nullable public android.content.res.Configuration getTaskConfiguration();
		method @Nullable public android.window.TaskFragmentInfo getTaskFragmentInfo();
		method @Nullable public android.window.TaskFragmentParentInfo getTaskFragmentParentInfo();
		method @Nullable public android.os.IBinder getTaskFragmentToken();
		method public int getTaskId();
		method public int getType();
		@@ -4293,7 +4299,6 @@ package android.window {
		method @NonNull public android.window.TaskFragmentTransaction.Change setActivityToken(@NonNull android.os.IBinder);
		method @NonNull public android.window.TaskFragmentTransaction.Change setErrorBundle(@NonNull android.os.Bundle);
		method @NonNull public android.window.TaskFragmentTransaction.Change setErrorCallbackToken(@Nullable android.os.IBinder);
		method @NonNull public android.window.TaskFragmentTransaction.Change setTaskConfiguration(@NonNull android.content.res.Configuration);
		method @NonNull public android.window.TaskFragmentTransaction.Change setTaskFragmentInfo(@NonNull android.window.TaskFragmentInfo);
		method @NonNull public android.window.TaskFragmentTransaction.Change setTaskFragmentToken(@NonNull android.os.IBinder);
		method @NonNull public android.window.TaskFragmentTransaction.Change setTaskId(int);

core/java/android/app/Activity.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -5796,6 +5796,8 @@ public class Activity extends ContextThemeWrapper
		* @see #onRequestPermissionsResult
		*/
		@FlaggedApi(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
		@SuppressLint("OnNameExpected")
		// Suppress lint as this is an overload of the original API.
		public boolean shouldShowRequestPermissionRationale(@NonNull String permission, int deviceId) {
		final PackageManager packageManager = getDeviceId() == deviceId ? getPackageManager()
		: createDeviceContext(deviceId).getPackageManager();