Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev (863c82fa) · Commits · e / os / android_frameworks_base

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.