commit f44b70ad331d839d3a1799ae91fe9d8a3433ee57
author Ben Murdoch <benm@google.com> Thu Feb 13 12:28:56 2014 +0000
committer Ben Murdoch <benm@google.com> Thu Feb 13 12:28:56 2014 +0000
tree c4edfd78bc8904ff5f963f726192103742b8e5ee
parent b401273577ed9561f7cea58cf3897dcae621a4d7

FORK: Fix the crash issue caused by vibrate permission

Original change: https://codereview.chromium.org/143673004/

Bug: 12832701
Change-Id: Id05a37baa30dde92e6f9371b0dee3be5deae502f

content/public/android/java/src/org/chromium/content/browser/VibrationProvider.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/VibrationProvider.java b/content/public/android/java/src/org/chromium/content/browser/VibrationProvider.java
index 10edcbb..015d8d8 100644
--- a/content/public/android/java/src/org/chromium/content/browser/VibrationProvider.java
+++ b/content/public/android/java/src/org/chromium/content/browser/VibrationProvider.java
@@ -5,8 +5,10 @@
 package org.chromium.content.browser;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.media.AudioManager;
 import android.os.Vibrator;
+import android.util.Log;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
@@ -16,9 +18,11 @@
  */
 @JNINamespace("content")
 class VibrationProvider {
+    private static final String TAG = "VibrationProvider";
 
     private final AudioManager mAudioManager;
     private final Vibrator mVibrator;
+    private final boolean mHasVibratePermission;
 
     @CalledByNative
     private static VibrationProvider create(Context context) {
@@ -27,17 +31,24 @@
 
     @CalledByNative
     private void vibrate(long milliseconds) {
-        if (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_SILENT)
+        if (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_SILENT &&
+                mHasVibratePermission) {
             mVibrator.vibrate(milliseconds);
+        }
     }
 
     @CalledByNative
     private void cancelVibration() {
-        mVibrator.cancel();
+        if (mHasVibratePermission) mVibrator.cancel();
     }
 
     private VibrationProvider(Context context) {
         mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+        mHasVibratePermission = context.checkCallingOrSelfPermission(
+                android.Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED;
+        if (!mHasVibratePermission) {
+            Log.w(TAG, "Failed to use vibrate API, requires VIBRATE permission.");
+        }
     }
 }