Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-07-24 23:55:38 +00:00
committed by Android (Google) Code Review

View File

@@ -304,6 +304,7 @@ public final class VibrationAttributes implements Parcelable {
@Nullable VibrationEffect effect) {
mAudioAttributes = audio;
setUsage(audio);
setFlags(audio);
applyHapticFeedbackHeuristics(effect);
}
@@ -360,6 +361,12 @@ public final class VibrationAttributes implements Parcelable {
}
}
private void setFlags(@NonNull AudioAttributes audio) {
if ((audio.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {
mFlags |= FLAG_BYPASS_INTERRUPTION_POLICY;
}
}
/**
* Combines all of the attributes that have been set and returns a new
* {@link VibrationAttributes} object.