commit 6fb54653fe0458acc6768a24a2f1280fbeddd430
author Yorke Lee <yorkelee@google.com> Mon Jun 30 15:52:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 26 18:42:03 2014 +0000
tree b1d2de8091ac97e3d4bc0e97959910a0c9229f54
parent 425284e2cc4cf63a2d8059bdfb770c5f6636cb7e
parent 426cd03d30422faf49e2bc2b97fb8416fdd68518

Merge "Remove use of private API: SystemVibrator"

src/com/android/phone/common/HapticFeedback.java

diff --git a/src/com/android/phone/common/HapticFeedback.java b/src/com/android/phone/common/HapticFeedback.java
index f19b8a6..2b17523 100644
--- a/src/com/android/phone/common/HapticFeedback.java
+++ b/src/com/android/phone/common/HapticFeedback.java
@@ -19,7 +19,6 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.SystemVibrator;
 import android.os.Vibrator;
 import android.provider.Settings;
 import android.provider.Settings.System;
@@ -88,9 +87,7 @@
     public void init(Context context, boolean enabled) {
         mEnabled = enabled;
         if (enabled) {
-            // We don't rely on getSystemService(Context.VIBRATOR_SERVICE) to make sure this
-            // vibrator object will be isolated from others.
-            mVibrator = new SystemVibrator(context);
+            mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
             mHapticPattern = new long[] {0, DURATION, 2 * DURATION, 3 * DURATION};
             mSystemSettings = new Settings.System();
             mContentResolver = context.getContentResolver();