Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix vibration effect segment validation regression on allocation count" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-01 15:30:57 +00:00
committed by Android (Google) Code Review
parent be091340e3 9721eda984
commit 9870b8a5f4
4 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/vibrator/PrimitiveSegment.java
View File

@@ -108,7 +108,7 @@ public final class PrimitiveSegment extends VibrationEffectSegment {
Preconditions.checkArgumentInRange(mPrimitiveId, VibrationEffect.Composition.PRIMITIVE_NOOP,
VibrationEffect.Composition.PRIMITIVE_LOW_TICK, "primitiveId");
Preconditions.checkArgumentInRange(mScale, 0f, 1f, "scale");
Preconditions.checkArgumentNonnegative(mDelay, "primitive delay should be >= 0");
VibrationEffectSegment.checkDurationArgument(mDelay, "delay");
}
@Override

11
core/java/android/os/vibrator/RampSegment.java
View File

@@ -108,14 +108,9 @@ public final class RampSegment extends VibrationEffectSegment {
/** @hide */
@Override
public void validate() {
Preconditions.checkArgumentNonNegative(mStartFrequencyHz,
"Frequencies must all be >= 0, got start frequency of " + mStartFrequencyHz);
Preconditions.checkArgumentFinite(mStartFrequencyHz, "startFrequencyHz");
Preconditions.checkArgumentNonNegative(mEndFrequencyHz,
"Frequencies must all be >= 0, got end frequency of " + mEndFrequencyHz);
Preconditions.checkArgumentFinite(mEndFrequencyHz, "endFrequencyHz");
Preconditions.checkArgumentNonnegative(mDuration,
"Durations must all be >= 0, got " + mDuration);
VibrationEffectSegment.checkFrequencyArgument(mStartFrequencyHz, "startFrequencyHz");
VibrationEffectSegment.checkFrequencyArgument(mEndFrequencyHz, "endFrequencyHz");
VibrationEffectSegment.checkDurationArgument(mDuration, "duration");
Preconditions.checkArgumentInRange(mStartAmplitude, 0f, 1f, "startAmplitude");
Preconditions.checkArgumentInRange(mEndAmplitude, 0f, 1f, "endAmplitude");
}

7
core/java/android/os/vibrator/StepSegment.java
View File

@@ -95,11 +95,8 @@ public final class StepSegment extends VibrationEffectSegment {
/** @hide */
@Override
public void validate() {
Preconditions.checkArgumentNonNegative(mFrequencyHz,
"Frequencies must all be >= 0, got " + mFrequencyHz);
Preconditions.checkArgumentFinite(mFrequencyHz, "frequencyHz");
Preconditions.checkArgumentNonnegative(mDuration,
"Durations must all be >= 0, got " + mDuration);
VibrationEffectSegment.checkFrequencyArgument(mFrequencyHz, "frequencyHz");
VibrationEffectSegment.checkDurationArgument(mDuration, "duration");
if (Float.compare(mAmplitude, VibrationEffect.DEFAULT_AMPLITUDE) != 0) {
Preconditions.checkArgumentInRange(mAmplitude, 0f, 1f, "amplitude");
}

37
core/java/android/os/vibrator/VibrationEffectSegment.java
View File

@@ -112,6 +112,43 @@ public abstract class VibrationEffectSegment implements Parcelable {
@NonNull
public abstract <T extends VibrationEffectSegment> T applyEffectStrength(int effectStrength);
/**
* Checks the given frequency argument is valid to represent a vibration effect frequency in
* hertz, i.e. a finite non-negative value.
*
* @param value the frequency argument value to be checked
* @param name the argument name for the error message.
*
* @hide
*/
public static void checkFrequencyArgument(float value, @NonNull String name) {
// Similar to combining Preconditions checkArgumentFinite + checkArgumentNonnegative,
// but this implementation doesn't create the error message unless a check fail.
if (Float.isNaN(value)) {
throw new IllegalArgumentException(name + " must not be NaN");
}
if (Float.isInfinite(value)) {
throw new IllegalArgumentException(name + " must not be infinite");
}
if (value < 0) {
throw new IllegalArgumentException(name + " must be >= 0, got " + value);
}
}
/**
* Checks the given duration argument is valid, i.e. a non-negative value.
*
* @param value the duration value to be checked
* @param name the argument name for the error message.
*
* @hide
*/
public static void checkDurationArgument(long value, @NonNull String name) {
if (value < 0) {
throw new IllegalArgumentException(name + " must be >= 0, got " + value);
}
}
@NonNull
public static final Creator<VibrationEffectSegment> CREATOR =
new Creator<VibrationEffectSegment>() {