Snap for 6709207 from 486e4a47cdb9f1263727aada5b5bb0f7a88525e6 to rvc-qpr1-release (a7b52f94) · 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.

+1 −0

Original line number	Diff line number	Diff line
		@@ -353,6 +353,7 @@
		<protected-broadcast android:name="com.android.server.wifi.action.CarrierNetwork.USER_ALLOWED_CARRIER" />
		<protected-broadcast android:name="com.android.server.wifi.action.CarrierNetwork.USER_DISALLOWED_CARRIER" />
		<protected-broadcast android:name="com.android.server.wifi.action.CarrierNetwork.USER_DISMISSED" />
		<protected-broadcast android:name="com.android.server.wifi.action.CarrierNetwork.USER_CLICKED" />
		<protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.USER_DISMISSED_NOTIFICATION" />
		<protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.CONNECT_TO_NETWORK" />
		<protected-broadcast android:name="com.android.server.wifi.ConnectToNetworkNotification.PICK_WIFI_NETWORK" />

+212 −66

File changed.

Preview size limit exceeded, changes collapsed.

+213 −67

File changed.

Preview size limit exceeded, changes collapsed.

+281 −137

File changed.

Preview size limit exceeded, changes collapsed.