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

Commit b4477092 authored Apr 13, 2021 by Lais Andrade Committed by Android (Google) Code Review Apr 13, 2021

Merge "Add Vibrator.cancel method with usage filters" into sc-dev

parents 96ed0420 6e075783

core/java/android/hardware/input/InputDeviceVibrator.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -175,4 +175,9 @@ final class InputDeviceVibrator extends Vibrator {
		public void cancel() {
		mInputManager.cancelVibrate(mDeviceId, mToken);
		}

		@Override
		public void cancel(int usageFilter) {
		cancel();
		}
		}

core/java/android/hardware/input/InputDeviceVibratorManager.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -134,4 +134,9 @@ public class InputDeviceVibratorManager extends VibratorManager
		public void cancel() {
		mInputManager.cancelVibrate(mDeviceId, mToken);
		}

		@Override
		public void cancel(int usageFilter) {
		cancel();
		}
		}

core/java/android/os/IVibratorManagerService.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,5 +32,5 @@ interface IVibratorManagerService {
		in CombinedVibration vibration, in VibrationAttributes attributes);
		void vibrate(int uid, String opPkg, in CombinedVibration vibration,
		in VibrationAttributes attributes, String reason, IBinder token);
		void cancelVibrate(IBinder token);
		void cancelVibrate(int usageFilter, IBinder token);
		}

core/java/android/os/NullVibrator.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -54,4 +54,8 @@ public class NullVibrator extends Vibrator {
		@Override
		public void cancel() {
		}

		@Override
		public void cancel(int usageFilter) {
		}
		}

core/java/android/os/SystemVibrator.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,15 @@ public class SystemVibrator extends Vibrator {
		mVibratorManager.cancel();
		}

		@Override
		public void cancel(int usageFilter) {
		if (mVibratorManager == null) {
		Log.w(TAG, "Failed to cancel vibrate; no vibrator manager.");
		return;
		}
		mVibratorManager.cancel(usageFilter);
		}

		/**
		* Tries to unregister individual {@link android.os.Vibrator.OnVibratorStateChangedListener}
		* that were left registered to vibrators after failures to register them to all vibrators.