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

Commit 61e32caa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I3b5157ab8e234e349465ed94f15f6d9ef53cac5f
parents 4f7fa277 863c82fa

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.