Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2777148 authored by Lais Andrade's avatar Lais Andrade
Browse files

Propagate AudioAttributes flags to VibrationAttributes 

Set supported flags from AudioAttributes into VibrationAttributes on the
builder constructor.

Fix: b/161761418
Test: manual
Change-Id: I4a8e1db278843b2f9f19aba43b0b8f264cb696bd
parent 32ff9bfa

core/java/android/os/VibrationAttributes.java

+7 −0
Original line number Diff line number Diff line
@@ -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.