Snap for 8429531 from 6f840d84f2cb875ce1a75e795c5632c83c9c566d to tm-qpr1-release (f68719fe) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1974,8 +1974,8 @@ public final class JobStatus {
		case 2: return "FREQUENT";
		case 3: return "RARE";
		case 4: return "NEVER";
		case 5:
		return "RESTRICTED";
		case 5: return "RESTRICTED";
		case 6: return "EXEMPTED";
		default:
		return "Unknown: " + standbyBucket;
		}

core/api/current.txt

+0 −36

Original line number	Diff line number	Diff line
		@@ -32341,9 +32341,6 @@ package android.os {
		method public static android.os.VibrationEffect createWaveform(long[], int[], int);
		method public int describeContents();
		method @NonNull public static android.os.VibrationEffect.Composition startComposition();
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform();
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform(@NonNull android.os.VibrationEffect.VibrationParameter);
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform(@NonNull android.os.VibrationEffect.VibrationParameter, @NonNull android.os.VibrationEffect.VibrationParameter);
		field @NonNull public static final android.os.Parcelable.Creator<android.os.VibrationEffect> CREATOR;
		field public static final int DEFAULT_AMPLITUDE = -1; // 0xffffffff
		field public static final int EFFECT_CLICK = 0; // 0x0
		@@ -32353,13 +32350,10 @@ package android.os {
		}

		public static final class VibrationEffect.Composition {
		method @NonNull public android.os.VibrationEffect.Composition addEffect(@NonNull android.os.VibrationEffect);
		method @NonNull public android.os.VibrationEffect.Composition addOffDuration(@NonNull java.time.Duration);
		method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int);
		method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float);
		method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int);
		method @NonNull public android.os.VibrationEffect compose();
		method @NonNull public android.os.VibrationEffect.Composition repeatEffectIndefinitely(@NonNull android.os.VibrationEffect);
		field public static final int PRIMITIVE_CLICK = 1; // 0x1
		field public static final int PRIMITIVE_LOW_TICK = 8; // 0x8
		field public static final int PRIMITIVE_QUICK_FALL = 6; // 0x6
		@@ -32370,34 +32364,15 @@ package android.os {
		field public static final int PRIMITIVE_TICK = 7; // 0x7
		}

		public static final class VibrationEffect.Composition.UnreachableAfterRepeatingIndefinitelyException extends java.lang.IllegalStateException {
		}

		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);
		}

		public static final class VibrationEffect.WaveformBuilder {
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addSustain(@NonNull java.time.Duration);
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addTransition(@NonNull java.time.Duration, @NonNull android.os.VibrationEffect.VibrationParameter);
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addTransition(@NonNull java.time.Duration, @NonNull android.os.VibrationEffect.VibrationParameter, @NonNull android.os.VibrationEffect.VibrationParameter);
		method @NonNull public android.os.VibrationEffect build();
		}

		public abstract class Vibrator {
		method public final int areAllEffectsSupported(@NonNull int...);
		method public final boolean areAllPrimitivesSupported(@NonNull int...);
		method @NonNull public int[] areEffectsSupported(@NonNull int...);
		method @NonNull public boolean[] arePrimitivesSupported(@NonNull int...);
		method @RequiresPermission(android.Manifest.permission.VIBRATE) public abstract void cancel();
		method @Nullable public android.os.vibrator.VibratorFrequencyProfile getFrequencyProfile();
		method public int getId();
		method @NonNull public int[] getPrimitiveDurations(@NonNull int...);
		method public float getQFactor();
		method public float getResonantFrequency();
		method public abstract boolean hasAmplitudeControl();
		method public boolean hasFrequencyControl();
		method public abstract boolean hasVibrator();
		method @Deprecated @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(long);
		method @Deprecated @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(long, android.media.AudioAttributes);
		@@ -32725,17 +32700,6 @@ package android.os.strictmode {

		}

		package android.os.vibrator {

		public final class VibratorFrequencyProfile {
		method public float getMaxAmplitudeMeasurementInterval();
		method @FloatRange(from=0, to=1) @NonNull public float[] getMaxAmplitudeMeasurements();
		method public float getMaxFrequency();
		method public float getMinFrequency();
		}

		}

		package android.preference {

		@Deprecated public class CheckBoxPreference extends android.preference.TwoStatePreference {

core/api/test-current.txt

+35 −0

Original line number	Diff line number	Diff line
		@@ -1871,6 +1871,9 @@ package android.os {
		method public static android.os.VibrationEffect get(int, boolean);
		method @Nullable public static android.os.VibrationEffect get(android.net.Uri, android.content.Context);
		method public abstract long getDuration();
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform();
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform(@NonNull android.os.VibrationEffect.VibrationParameter);
		method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform(@NonNull android.os.VibrationEffect.VibrationParameter, @NonNull android.os.VibrationEffect.VibrationParameter);
		field public static final int EFFECT_POP = 4; // 0x4
		field public static final int EFFECT_STRENGTH_LIGHT = 0; // 0x0
		field public static final int EFFECT_STRENGTH_MEDIUM = 1; // 0x1
		@@ -1888,8 +1891,33 @@ package android.os {
		field @NonNull public static final android.os.Parcelable.Creator<android.os.VibrationEffect.Composed> CREATOR;
		}

		public static final class VibrationEffect.Composition {
		method @NonNull public android.os.VibrationEffect.Composition addEffect(@NonNull android.os.VibrationEffect);
		method @NonNull public android.os.VibrationEffect.Composition addOffDuration(@NonNull java.time.Duration);
		method @NonNull public android.os.VibrationEffect.Composition repeatEffectIndefinitely(@NonNull android.os.VibrationEffect);
		}

		public static final class VibrationEffect.Composition.UnreachableAfterRepeatingIndefinitelyException extends java.lang.IllegalStateException {
		}

		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);
		}

		public static final class VibrationEffect.WaveformBuilder {
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addSustain(@NonNull java.time.Duration);
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addTransition(@NonNull java.time.Duration, @NonNull android.os.VibrationEffect.VibrationParameter);
		method @NonNull public android.os.VibrationEffect.WaveformBuilder addTransition(@NonNull java.time.Duration, @NonNull android.os.VibrationEffect.VibrationParameter, @NonNull android.os.VibrationEffect.VibrationParameter);
		method @NonNull public android.os.VibrationEffect build();
		}

		public abstract class Vibrator {
		method public int getDefaultVibrationIntensity(int);
		method @Nullable public android.os.vibrator.VibratorFrequencyProfile getFrequencyProfile();
		method public float getQFactor();
		method public float getResonantFrequency();
		method public boolean hasFrequencyControl();
		field public static final int VIBRATION_INTENSITY_HIGH = 3; // 0x3
		field public static final int VIBRATION_INTENSITY_LOW = 1; // 0x1
		field public static final int VIBRATION_INTENSITY_MEDIUM = 2; // 0x2
		@@ -2074,6 +2102,13 @@ package android.os.vibrator {
		field @NonNull public static final android.os.Parcelable.Creator<android.os.vibrator.VibrationEffectSegment> CREATOR;
		}

		public final class VibratorFrequencyProfile {
		method public float getMaxAmplitudeMeasurementInterval();
		method @FloatRange(from=0, to=1) @NonNull public float[] getMaxAmplitudeMeasurements();
		method public float getMaxFrequency();
		method public float getMinFrequency();
		}

		}

		package android.permission {

core/java/android/app/ActivityManagerInternal.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -562,15 +562,14 @@ public abstract class ActivityManagerInternal {
		public abstract void unregisterProcessObserver(IProcessObserver processObserver);

		/**
		* Gets the uid of the instrumentation source if there is an unfinished instrumentation that
		* targets the given uid.
		* Checks if there is an unfinished instrumentation that targets the given uid.
		*
		* @param uid The uid to be checked for
		*
		* @return the uid of the instrumentation source, if there is an instrumentation whose target
		* application uid matches the given uid, and {@link android.os.Process#INVALID_UID} otherwise.
		* @return True, if there is an instrumentation whose target application uid matches the given
		* uid, false otherwise
		*/
		public abstract int getInstrumentationSourceUid(int uid);
		public abstract boolean isUidCurrentlyInstrumented(int uid);

		/** Is this a device owner app? */
		public abstract boolean isDeviceOwner(int uid);

core/java/android/app/ActivityOptions.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -365,6 +365,9 @@ public class ActivityOptions extends ComponentOptions {
		private static final String KEY_DISMISS_KEYGUARD_IF_INSECURE =
		"android.activity.dismissKeyguardIfInsecure";

		private static final String KEY_IGNORE_PENDING_INTENT_CREATOR_FOREGROUND_STATE =
		"android.activity.ignorePendingIntentCreatorForegroundState";

		/**
		* @see #setLaunchCookie
		* @hide
		@@ -462,6 +465,7 @@ public class ActivityOptions extends ComponentOptions {
		private boolean mTransientLaunch;
		private PictureInPictureParams mLaunchIntoPipParams;
		private boolean mDismissKeyguardIfInsecure;
		private boolean mIgnorePendingIntentCreatorForegroundState;

		/**
		* Create an ActivityOptions specifying a custom animation to run when
		@@ -1260,6 +1264,8 @@ public class ActivityOptions extends ComponentOptions {
		mIsEligibleForLegacyPermissionPrompt =
		opts.getBoolean(KEY_LEGACY_PERMISSION_PROMPT_ELIGIBLE);
		mDismissKeyguardIfInsecure = opts.getBoolean(KEY_DISMISS_KEYGUARD_IF_INSECURE);
		mIgnorePendingIntentCreatorForegroundState = opts.getBoolean(
		KEY_IGNORE_PENDING_INTENT_CREATOR_FOREGROUND_STATE);
		}

		/**
		@@ -1876,6 +1882,23 @@ public class ActivityOptions extends ComponentOptions {
		return mDismissKeyguardIfInsecure;
		}

		/**
		* Sets background activity launch logic won't use pending intent creator foreground state.
		* @hide
		*/
		public void setIgnorePendingIntentCreatorForegroundState(boolean state) {
		mIgnorePendingIntentCreatorForegroundState = state;
		}

		/**
		* @return whether background activity launch logic should use pending intent creator
		* foreground state.
		* @hide
		*/
		public boolean getIgnorePendingIntentCreatorForegroundState() {
		return mIgnorePendingIntentCreatorForegroundState;
		}

		/**
		* Update the current values in this ActivityOptions from those supplied
		* in <var>otherOptions</var>. Any values
		@@ -2140,6 +2163,10 @@ public class ActivityOptions extends ComponentOptions {
		if (mDismissKeyguardIfInsecure) {
		b.putBoolean(KEY_DISMISS_KEYGUARD_IF_INSECURE, mDismissKeyguardIfInsecure);
		}
		if (mIgnorePendingIntentCreatorForegroundState) {
		b.putBoolean(KEY_IGNORE_PENDING_INTENT_CREATOR_FOREGROUND_STATE,
		mIgnorePendingIntentCreatorForegroundState);
		}
		return b;
		}