Snap for 12135134 from 22bba40d47d9bdbad7abd4d5ee35d163d0acf298 to 24Q4-release (547f3a34) · Commits · e / os / android_frameworks_base

Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -255,7 +255,7 @@ java_library {
		"android.hardware.vibrator-V1.1-java",
		"android.hardware.vibrator-V1.2-java",
		"android.hardware.vibrator-V1.3-java",
		"android.hardware.vibrator-V2-java",
		"android.hardware.vibrator-V3-java",
		"android.se.omapi-V1-java",
		"android.system.suspend.control.internal-java",
		"devicepolicyprotosnano",

core/api/system-current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -409,6 +409,7 @@ package android {
		field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String USE_ON_DEVICE_INTELLIGENCE = "android.permission.USE_ON_DEVICE_INTELLIGENCE";
		field public static final String USE_RESERVED_DISK = "android.permission.USE_RESERVED_DISK";
		field public static final String UWB_PRIVILEGED = "android.permission.UWB_PRIVILEGED";
		field @FlaggedApi("android.os.vibrator.vendor_vibration_effects") public static final String VIBRATE_VENDOR_EFFECTS = "android.permission.VIBRATE_VENDOR_EFFECTS";
		field public static final String WHITELIST_AUTO_REVOKE_PERMISSIONS = "android.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS";
		field public static final String WHITELIST_RESTRICTED_PERMISSIONS = "android.permission.WHITELIST_RESTRICTED_PERMISSIONS";
		field public static final String WIFI_ACCESS_COEX_UNSAFE_CHANNELS = "android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS";
		@@ -11354,6 +11355,10 @@ package android.os {
		field @NonNull public static final android.os.Parcelable.Creator<android.os.UserManager.EnforcingUser> CREATOR;
		}

		public abstract class VibrationEffect implements android.os.Parcelable {
		method @FlaggedApi("android.os.vibrator.vendor_vibration_effects") @NonNull @RequiresPermission(android.Manifest.permission.VIBRATE_VENDOR_EFFECTS) public static android.os.VibrationEffect createVendorEffect(@NonNull android.os.PersistableBundle);
		}

		public abstract class Vibrator {
		method @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public void addVibratorStateListener(@NonNull android.os.Vibrator.OnVibratorStateChangedListener);
		method @RequiresPermission(android.Manifest.permission.ACCESS_VIBRATOR_STATE) public void addVibratorStateListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.Vibrator.OnVibratorStateChangedListener);

core/api/test-current.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -2577,6 +2577,16 @@ package android.os {
		public static final class VibrationEffect.Composition.UnreachableAfterRepeatingIndefinitelyException extends java.lang.IllegalStateException {
		}

		@FlaggedApi("android.os.vibrator.vendor_vibration_effects") public static final class VibrationEffect.VendorEffect extends android.os.VibrationEffect {
		method @Nullable public long[] computeCreateWaveformOffOnTimingsOrNull();
		method public long getDuration();
		method public int getEffectStrength();
		method public float getLinearScale();
		method @NonNull public android.os.PersistableBundle getVendorData();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.os.VibrationEffect.VendorEffect> CREATOR;
		}

		public static class VibrationEffect.VibrationParameter {
		method @NonNull public static android.os.VibrationEffect.VibrationParameter targetAmplitude(@FloatRange(from=0, to=1) float);
		method @NonNull public static android.os.VibrationEffect.VibrationParameter targetFrequency(@FloatRange(from=1) float);

core/java/android/app/Activity.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -2214,6 +2214,9 @@ public class Activity extends ContextThemeWrapper
		notifyVoiceInteractionManagerServiceActivityEvent(
		VoiceInteractionSession.VOICE_INTERACTION_ACTIVITY_EVENT_RESUME);

		// Notify autofill
		getAutofillClientController().onActivityPostResumed();

		mCalled = true;
		}

core/java/android/app/ActivityThread.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -3818,8 +3818,7 @@ public final class ActivityThread extends ClientTransactionHandler
		final ArrayList<ResultInfo> list = new ArrayList<>();
		list.add(new ResultInfo(id, requestCode, resultCode, data, activityToken));
		final ClientTransaction clientTransaction = new ClientTransaction(mAppThread);
		final ActivityResultItem activityResultItem = ActivityResultItem.obtain(
		activityToken, list);
		final ActivityResultItem activityResultItem = new ActivityResultItem(activityToken, list);
		clientTransaction.addTransactionItem(activityResultItem);
		try {
		mAppThread.scheduleTransaction(clientTransaction);
		@@ -4614,7 +4613,7 @@ public final class ActivityThread extends ClientTransactionHandler

		private void schedulePauseWithUserLeavingHint(ActivityClientRecord r) {
		final ClientTransaction transaction = new ClientTransaction(mAppThread);
		final PauseActivityItem pauseActivityItem = PauseActivityItem.obtain(r.token,
		final PauseActivityItem pauseActivityItem = new PauseActivityItem(r.token,
		r.activity.isFinishing(), /* userLeaving */ true,
		/* dontReport / false, / autoEnteringPip */ false);
		transaction.addTransactionItem(pauseActivityItem);
		@@ -4623,7 +4622,7 @@ public final class ActivityThread extends ClientTransactionHandler

		private void scheduleResume(ActivityClientRecord r) {
		final ClientTransaction transaction = new ClientTransaction(mAppThread);
		final ResumeActivityItem resumeActivityItem = ResumeActivityItem.obtain(r.token,
		final ResumeActivityItem resumeActivityItem = new ResumeActivityItem(r.token,
		/* isForward / false, / shouldSendCompatFakeFocus */ false);
		transaction.addTransactionItem(resumeActivityItem);
		executeTransaction(transaction);
		@@ -6239,7 +6238,7 @@ public final class ActivityThread extends ClientTransactionHandler
		r.createdConfig != null
		? r.createdConfig : mConfigurationController.getConfiguration(),
		r.overrideConfig);
		final ActivityRelaunchItem activityRelaunchItem = ActivityRelaunchItem.obtain(
		final ActivityRelaunchItem activityRelaunchItem = new ActivityRelaunchItem(
		r.token, null /* pendingResults /, null / pendingIntents */,
		0 /* configChanges */, mergedConfiguration, r.mPreserveWindow,
		r.getActivityWindowInfo());