Index: services/device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java |
diff --git a/services/device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java b/services/device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java |
index 0f23f0f122449ccaf870fb9e308d7b7570581a3a..d29525a1984277025cb7a644852d837e8c42aced 100644 |
--- a/services/device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java |
+++ b/services/device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.java |
@@ -9,6 +9,7 @@ import android.content.pm.PackageManager; |
import android.media.AudioManager; |
import android.os.Vibrator; |
+import org.chromium.base.ContextUtils; |
import org.chromium.base.Log; |
import org.chromium.base.annotations.CalledByNative; |
import org.chromium.base.annotations.JNINamespace; |
@@ -34,12 +35,14 @@ public class VibrationManagerImpl implements VibrationManager { |
private static long sVibrateMilliSecondsForTesting = -1; |
private static boolean sVibrateCancelledForTesting = false; |
- public VibrationManagerImpl(Context context) { |
- mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); |
- mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE); |
+ public VibrationManagerImpl() { |
+ mAudioManager = (AudioManager) ContextUtils.getApplicationContext().getSystemService( |
+ Context.AUDIO_SERVICE); |
+ mVibrator = (Vibrator) ContextUtils.getApplicationContext().getSystemService( |
+ Context.VIBRATOR_SERVICE); |
// TODO(mvanouwerkerk): What happens if permission is revoked? Handle this better. |
- mHasVibratePermission = |
- context.checkCallingOrSelfPermission(android.Manifest.permission.VIBRATE) |
+ mHasVibratePermission = ContextUtils.getApplicationContext().checkCallingOrSelfPermission( |
+ android.Manifest.permission.VIBRATE) |
== PackageManager.PERMISSION_GRANTED; |
if (!mHasVibratePermission) { |
Log.w(TAG, "Failed to use vibrate API, requires VIBRATE permission."); |
@@ -80,14 +83,11 @@ public class VibrationManagerImpl implements VibrationManager { |
* A factory for implementations of the VibrationManager interface. |
*/ |
public static class Factory implements InterfaceFactory<VibrationManager> { |
- private Context mContext; |
- public Factory(Context context) { |
- mContext = context; |
- } |
+ public Factory() {} |
agrieve
2017/05/04 15:55:50
nit: delete.
Peter Wen
2017/05/04 17:39:26
Done.
|
@Override |
public VibrationManager createImpl() { |
- return new VibrationManagerImpl(mContext); |
+ return new VibrationManagerImpl(); |
} |
} |