Snap for 12158986 from a5971de4bd204f8a799b28f99882aa3dd48b04ab to 24Q4-release (e8c3809f) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -6718,6 +6718,14 @@ package android.hardware.soundtrigger {
		field public static final int STATUS_OK = 0; // 0x0
		}

		@FlaggedApi("android.media.soundtrigger.sound_trigger_generic_model_api") public static final class SoundTrigger.GenericSoundModel extends android.hardware.soundtrigger.SoundTrigger.SoundModel implements android.os.Parcelable {
		ctor public SoundTrigger.GenericSoundModel(@NonNull java.util.UUID, @NonNull java.util.UUID, @Nullable byte[], int);
		ctor public SoundTrigger.GenericSoundModel(@NonNull java.util.UUID, @NonNull java.util.UUID, @Nullable byte[]);
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.soundtrigger.SoundTrigger.GenericSoundModel> CREATOR;
		}

		public static final class SoundTrigger.Keyphrase implements android.os.Parcelable {
		ctor public SoundTrigger.Keyphrase(int, int, @NonNull java.util.Locale, @NonNull String, @Nullable int[]);
		method public int describeContents();

+0 −23

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.content.ComponentName;
		import android.content.ContentProvider;
		import android.content.Intent;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.IBinder;
		@@ -660,28 +659,6 @@ public class ActivityClient {
		}
		}

		/**
		* Shows or hides a Camera app compat toggle for stretched issues with the requested state.
		*
		* @param token The token for the window that needs a control.
		* @param showControl Whether the control should be shown or hidden.
		* @param transformationApplied Whether the treatment is already applied.
		* @param callback The callback executed when the user clicks on a control.
		*/
		void requestCompatCameraControl(Resources res, IBinder token, boolean showControl,
		boolean transformationApplied, ICompatCameraControlCallback callback) {
		if (!res.getBoolean(com.android.internal.R.bool
		.config_isCameraCompatControlForStretchedIssuesEnabled)) {
		return;
		}
		try {
		getActivityClientController().requestCompatCameraControl(
		token, showControl, transformationApplied, callback);
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}
		}

		public static ActivityClient getInstance() {
		return sInstance.get();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ public class ActivityTaskManager {
		}
		}

		/** Removes root tasks of the activity types from the system. */
		/** Removes root tasks of the activity types from the Default TDA of all displays. */
		@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)
		public void removeRootTasksWithActivityTypes(@NonNull int[] activityTypes) {
		try {

+0 −13

Original line number	Diff line number	Diff line
		@@ -734,19 +734,6 @@ public final class ActivityThread extends ClientTransactionHandler
		activityWindowInfo,
		false /* alwaysReportChange */);
		}

		@Override
		public void requestCompatCameraControl(boolean showControl,
		boolean transformationApplied, ICompatCameraControlCallback callback) {
		if (activity == null) {
		throw new IllegalStateException(
		"Received camera compat control update for non-existing activity");
		}
		ActivityClient.getInstance().requestCompatCameraControl(
		activity.getResources(), token, showControl, transformationApplied,
		callback);
		}

		};
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -136,8 +136,7 @@ public class AppCompatTaskInfo implements Parcelable {
		* @return {@value true} if the task has some compat ui.
		*/
		public boolean hasCompatUI() {
		return cameraCompatTaskInfo.hasCameraCompatUI() \|\| topActivityInSizeCompat
		\|\| topActivityEligibleForLetterboxEducation
		return topActivityInSizeCompat \|\| topActivityEligibleForLetterboxEducation
		\|\| isLetterboxDoubleTapEnabled
		\|\| topActivityEligibleForUserAspectRatioButton;
		}