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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-24 23:55:38 +00:00
committed by Android (Google) Code Review
parent 855eb749ed c2777148df
commit 863c82fa76
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/VibrationAttributes.java
View File

@@ -304,6 +304,7 @@ public final class VibrationAttributes implements Parcelable {
@Nullable VibrationEffect effect) { @Nullable VibrationEffect effect) {
mAudioAttributes = audio; mAudioAttributes = audio;
setUsage(audio); setUsage(audio);
setFlags(audio);
applyHapticFeedbackHeuristics(effect); 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 * Combines all of the attributes that have been set and returns a new
* {@link VibrationAttributes} object. * {@link VibrationAttributes} object.