Merge "Extract vibration settings and scaling code from VibratorService" (c2787b22) · Commits · e / os / android_frameworks_base

core/java/android/os/VibrationEffect.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -413,7 +413,7 @@ public abstract class VibrationEffect implements Parcelable {
		*
		* @hide
		*/
		public abstract VibrationEffect resolve(int defaultAmplitude);
		public abstract <T extends VibrationEffect> T resolve(int defaultAmplitude);

		/**
		* Scale the vibration effect intensity with the given constraints.
		@@ -425,7 +425,7 @@ public abstract class VibrationEffect implements Parcelable {
		*
		* @hide
		*/
		public abstract VibrationEffect scale(float scaleFactor);
		public abstract <T extends VibrationEffect> T scale(float scaleFactor);

		/**
		* Scale given vibration intensity by the given factor.