Snap for 12065372 from 558c8c4942f4081b5b4a7b26dab254b28271247a to 24Q4-release (e8756331) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+15 −0

Original line number	Diff line number	Diff line
		@@ -1982,6 +1982,7 @@ package android.media {
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED) public float getRs2Value();
		method public int getStreamMinVolumeInt(int);
		method @NonNull public java.util.Map<java.lang.Integer,java.lang.Boolean> getSurroundFormats();
		method @NonNull public android.media.VolumePolicy getVolumePolicy();
		method public boolean hasRegisteredDynamicPolicy();
		method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED) public boolean isCsdEnabled();
		method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.QUERY_AUDIO_STATE, android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED}) public boolean isFullVolumeDevice();
		@@ -2073,6 +2074,20 @@ package android.media {
		method public android.media.PlaybackParams setAudioStretchMode(int);
		}

		public final class VolumePolicy implements android.os.Parcelable {
		ctor public VolumePolicy(boolean, boolean, boolean, int);
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int A11Y_MODE_INDEPENDENT_A11Y_VOLUME = 1; // 0x1
		field public static final int A11Y_MODE_MEDIA_A11Y_VOLUME = 0; // 0x0
		field @NonNull public static final android.os.Parcelable.Creator<android.media.VolumePolicy> CREATOR;
		field @NonNull public static final android.media.VolumePolicy DEFAULT;
		field public final boolean doNotDisturbWhenSilent;
		field public final int vibrateToSilentDebounce;
		field public final boolean volumeDownToEnterSilent;
		field public final boolean volumeUpToExitSilent;
		}

		public static final class VolumeShaper.Configuration.Builder {
		method @NonNull public android.media.VolumeShaper.Configuration.Builder setOptionFlags(int);
		}

core/java/android/app/Activity.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static android.Manifest.permission.DETECT_SCREEN_CAPTURE;
		import static android.Manifest.permission.INTERACT_ACROSS_USERS;
		import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
		import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW;
		import static android.app.Instrumentation.DEBUG_FINISH_ACTIVITY;
		import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
		import static android.app.WindowConfiguration.inMultiWindowMode;
		import static android.os.Process.myUid;
		@@ -7297,6 +7298,9 @@ public class Activity extends ContextThemeWrapper
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private void finish(int finishTask) {
		if (DEBUG_FINISH_ACTIVITY) {
		Log.d("Instrumentation", "finishActivity: finishTask=" + finishTask, new Throwable());
		}
		if (mParent == null) {
		int resultCode;
		Intent resultData;

core/java/android/app/Instrumentation.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,8 @@ public class Instrumentation {
		// If set, will print the stack trace for activity starts within the process
		static final boolean DEBUG_START_ACTIVITY = Build.IS_DEBUGGABLE &&
		SystemProperties.getBoolean("persist.wm.debug.start_activity", false);
		static final boolean DEBUG_FINISH_ACTIVITY = Build.IS_DEBUGGABLE &&
		SystemProperties.getBoolean("persist.wm.debug.finish_activity", false);

		/**
		* @hide

core/java/android/app/TaskInfo.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.content.pm.ActivityInfo;
		import android.content.res.Configuration;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.net.Uri;
		import android.os.Build;
		import android.os.IBinder;
		import android.os.Parcel;
		@@ -302,6 +303,19 @@ public class TaskInfo {
		*/
		public boolean isTopActivityStyleFloating;

		/**
		* The URI of the intent that generated the top-most activity opened using a URL.
		* @hide
		*/
		@Nullable
		public Uri capturedLink;

		/**
		* The time of the last launch of the activity opened using the {@link #capturedLink}.
		* @hide
		*/
		public long capturedLinkTimestamp;

		/**
		* Encapsulate specific App Compat information.
		* @hide
		@@ -436,6 +450,8 @@ public class TaskInfo {
		&& Objects.equals(topActivity, that.topActivity)
		&& isTopActivityTransparent == that.isTopActivityTransparent
		&& isTopActivityStyleFloating == that.isTopActivityStyleFloating
		&& Objects.equals(capturedLink, that.capturedLink)
		&& capturedLinkTimestamp == that.capturedLinkTimestamp
		&& appCompatTaskInfo.equalsForTaskOrganizer(that.appCompatTaskInfo);
		}

		@@ -506,6 +522,8 @@ public class TaskInfo {
		displayAreaFeatureId = source.readInt();
		isTopActivityTransparent = source.readBoolean();
		isTopActivityStyleFloating = source.readBoolean();
		capturedLink = source.readTypedObject(Uri.CREATOR);
		capturedLinkTimestamp = source.readLong();
		appCompatTaskInfo = source.readTypedObject(AppCompatTaskInfo.CREATOR);
		}

		@@ -554,6 +572,8 @@ public class TaskInfo {
		dest.writeInt(displayAreaFeatureId);
		dest.writeBoolean(isTopActivityTransparent);
		dest.writeBoolean(isTopActivityStyleFloating);
		dest.writeTypedObject(capturedLink, flags);
		dest.writeLong(capturedLinkTimestamp);
		dest.writeTypedObject(appCompatTaskInfo, flags);
		}

		@@ -592,6 +612,8 @@ public class TaskInfo {
		+ " displayAreaFeatureId=" + displayAreaFeatureId
		+ " isTopActivityTransparent=" + isTopActivityTransparent
		+ " isTopActivityStyleFloating=" + isTopActivityStyleFloating
		+ " capturedLink=" + capturedLink
		+ " capturedLinkTimestamp=" + capturedLinkTimestamp
		+ " appCompatTaskInfo=" + appCompatTaskInfo
		+ "}";
		}

core/java/android/app/admin/OWNERS

+0 −1

Original line number	Diff line number	Diff line
		# Bug component: 142675
		# Assign bugs to device-policy-manager-triage@google.com

		file:WorkDeviceExperience_OWNERS
		file:EnterprisePlatformSecurity_OWNERS

		yamasani@google.com #{LAST_RESORT_SUGGESTION}
		No newline at end of file