Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Unified Diff: device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java

Issue 1324853004: Add browsertests for VibrationManager java impl on android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Avoid static ref to android service Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/VibrationManagerImplTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java
diff --git a/device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java b/device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java
index dd8d2755c8a5df286dc21bf4d9dd33518aaf8c69..6a323afd8141b387486c8e736ebe311864423093 100644
--- a/device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java
+++ b/device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java
@@ -10,6 +10,7 @@ import android.media.AudioManager;
import android.os.Vibrator;
import android.util.Log;
+import org.chromium.base.VisibleForTesting;
import org.chromium.mojo.system.MojoException;
import org.chromium.mojom.device.VibrationManager;
@@ -27,9 +28,35 @@ public class VibrationManagerImpl implements VibrationManager {
private final Vibrator mVibrator;
private final boolean mHasVibratePermission;
+ private static AndroidVibratorWrapper sVibratorWrapper;
+
+ /**
+ * Android Vibrator wrapper class provided to test code to extend.
+ */
+ @VisibleForTesting
+ public static class AndroidVibratorWrapper {
+ protected AndroidVibratorWrapper() {}
+
+ public void vibrate(Vibrator vibrator, long milliseconds) {
+ vibrator.vibrate(milliseconds);
+ }
+
+ public void cancel(Vibrator vibrator) {
+ vibrator.cancel();
+ }
+ }
+
+ // Test code can use this function to inject other wrapper for testing.
+ public static void setVibratorWrapperForTesting(AndroidVibratorWrapper wrapper) {
+ sVibratorWrapper = wrapper;
+ }
+
public VibrationManagerImpl(Context context) {
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+ if (sVibratorWrapper == null) {
+ sVibratorWrapper = new AndroidVibratorWrapper();
+ }
mHasVibratePermission =
context.checkCallingOrSelfPermission(android.Manifest.permission.VIBRATE)
== PackageManager.PERMISSION_GRANTED;
@@ -53,12 +80,12 @@ public class VibrationManagerImpl implements VibrationManager {
if (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_SILENT
&& mHasVibratePermission) {
- mVibrator.vibrate(sanitizedMilliseconds);
+ sVibratorWrapper.vibrate(mVibrator, sanitizedMilliseconds);
}
}
@Override
public void cancel() {
- if (mHasVibratePermission) mVibrator.cancel();
+ if (mHasVibratePermission) sVibratorWrapper.cancel(mVibrator);
}
}
« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/VibrationManagerImplTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698