Snap for 11828632 from 8e08da9f2b1d15f0cf5308c7ce4e9bb61e5975f9 to 24Q3-release (cc761609) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+0 −8

Original line number	Diff line number	Diff line
		@@ -1043,19 +1043,11 @@ aconfig_declarations {
		name: "device_policy_aconfig_flags",
		package: "android.app.admin.flags",
		container: "system",
		exportable: true,
		srcs: [
		"core/java/android/app/admin/flags/flags.aconfig",
		],
		}

		java_aconfig_library {
		name: "device_policy_exported_aconfig_flags_lib",
		aconfig_declarations: "device_policy_aconfig_flags",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		mode: "exported",
		}

		java_aconfig_library {
		name: "device_policy_aconfig_flags_lib",
		aconfig_declarations: "device_policy_aconfig_flags",

apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerShellCommand.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ class BlobStoreManagerShellCommand extends ShellCommand {
		pw.println(" --tag: Tag of the blob to delete.");
		pw.println("idle-maintenance");
		pw.println(" Run idle maintenance which takes care of removing stale data.");
		pw.println("query-blob-existence [-b BLOB_ID]");
		pw.println("query-blob-existence [-b BLOB_ID] [-u \| --user USER_ID]");
		pw.println(" Prints 1 if blob exists, otherwise 0.");
		pw.println();
		}

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

+17 −12

Original line number	Diff line number	Diff line
		@@ -491,8 +491,10 @@ public abstract class JobScheduler {
		* Returns a list of all currently-executing jobs.
		* @hide
		*/
		@SuppressWarnings("HiddenAbstractMethod")
		public abstract List<JobInfo> getStartedJobs();
		@Nullable
		public List<JobInfo> getStartedJobs() {
		return null;
		}

		/**
		* <b>For internal system callers only!</b>
		@@ -501,8 +503,10 @@ public abstract class JobScheduler {
		* <p class="note">This is a slow operation, so it should be called sparingly.
		* @hide
		*/
		@SuppressWarnings("HiddenAbstractMethod")
		public abstract List<JobSnapshot> getAllJobSnapshots();
		@Nullable
		public List<JobSnapshot> getAllJobSnapshots() {
		return null;
		}

		/**
		* @hide
		@@ -510,8 +514,8 @@ public abstract class JobScheduler {
		@RequiresPermission(allOf = {
		android.Manifest.permission.MANAGE_ACTIVITY_TASKS,
		android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})
		@SuppressWarnings("HiddenAbstractMethod")
		public abstract void registerUserVisibleJobObserver(@NonNull IUserVisibleJobObserver observer);
		public void registerUserVisibleJobObserver(@NonNull IUserVisibleJobObserver observer) {
		}

		/**
		* @hide
		@@ -519,9 +523,10 @@ public abstract class JobScheduler {
		@RequiresPermission(allOf = {
		android.Manifest.permission.MANAGE_ACTIVITY_TASKS,
		android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})
		@SuppressWarnings("HiddenAbstractMethod")
		public abstract void unregisterUserVisibleJobObserver(
		@NonNull IUserVisibleJobObserver observer);
		public void unregisterUserVisibleJobObserver(
		@NonNull IUserVisibleJobObserver observer) {

		}

		/**
		* @hide
		@@ -529,7 +534,7 @@ public abstract class JobScheduler {
		@RequiresPermission(allOf = {
		android.Manifest.permission.MANAGE_ACTIVITY_TASKS,
		android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})
		@SuppressWarnings("HiddenAbstractMethod")
		public abstract void notePendingUserRequestedAppStop(@NonNull String packageName, int userId,
		@Nullable String debugReason);
		public void notePendingUserRequestedAppStop(@NonNull String packageName, int userId,
		@Nullable String debugReason) {
		}
		}

core/api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -966,7 +966,6 @@ package android.content {
		ctor public AttributionSource(int, @Nullable String, @Nullable String);
		ctor public AttributionSource(int, @Nullable String, @Nullable String, @NonNull android.os.IBinder);
		ctor public AttributionSource(int, @Nullable String, @Nullable String, @Nullable java.util.Set<java.lang.String>, @Nullable android.content.AttributionSource);
		ctor @FlaggedApi("android.permission.flags.attribution_source_constructor") public AttributionSource(int, int, @Nullable String, @Nullable String, @NonNull android.os.IBinder, @Nullable String[], @Nullable android.content.AttributionSource);
		ctor @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public AttributionSource(int, int, @Nullable String, @Nullable String, @NonNull android.os.IBinder, @Nullable String[], int, @Nullable android.content.AttributionSource);
		method public void enforceCallingPid();
		}

core/java/android/app/Notification.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.graphics.ColorUtils;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.ContrastColorUtil;
		import com.android.internal.util.NewlineNormalizer;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -3190,7 +3191,7 @@ public class Notification implements Parcelable
		return charSequence;
		}

		return charSequence.toString().replaceAll("[\r\n]+", "\n");
		return NewlineNormalizer.normalizeNewlines(charSequence.toString());
		}

		private static CharSequence removeTextSizeSpans(CharSequence charSequence) {
		@@ -6594,6 +6595,11 @@ public class Notification implements Parcelable
		* @hide
		*/
		public RemoteViews createCompactHeadsUpContentView() {
		// Don't show compact heads up for FSI notifications.
		if (mN.fullScreenIntent != null) {
		return createHeadsUpContentView(/* increasedHeight= */ false);
		}

		if (mStyle != null) {
		final RemoteViews styleView = mStyle.makeCompactHeadsUpContentView();
		if (styleView != null) {
		@@ -10351,7 +10357,7 @@ public class Notification implements Parcelable
		@Nullable
		@Override
		public RemoteViews makeCompactHeadsUpContentView() {
		// TODO(b/336228700): Apply minimal HUN treatment for Call Style.
		// Use existing heads up for call style.
		return makeHeadsUpContentView(false);
		}