Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76 am: be22e7af3f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12218307

Change-Id: Iccf5e3cf7ee7fd845f1ce0fe9ffea4a1598500b8

1 files changed, 7 insertions, 0 deletions

diff --git a/core/java/android/os/VibrationAttributes.java b/core/java/android/os/VibrationAttributes.java
index 27782fa74dab..171aef400b07 100644
--- a/core/java/android/os/VibrationAttributes.java
+++ b/core/java/android/os/VibrationAttributes.java
@@ -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.