summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-06-30 15:52:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-26 18:42:03 +0000
commit6fb54653fe0458acc6768a24a2f1280fbeddd430 (patch)
treeb1d2de8091ac97e3d4bc0e97959910a0c9229f54 /src
parent425284e2cc4cf63a2d8059bdfb770c5f6636cb7e (diff)
parent426cd03d30422faf49e2bc2b97fb8416fdd68518 (diff)
downloadandroid_packages_apps_PhoneCommon-6fb54653fe0458acc6768a24a2f1280fbeddd430.tar.gz
android_packages_apps_PhoneCommon-6fb54653fe0458acc6768a24a2f1280fbeddd430.tar.bz2
android_packages_apps_PhoneCommon-6fb54653fe0458acc6768a24a2f1280fbeddd430.zip
Merge "Remove use of private API: SystemVibrator"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/phone/common/HapticFeedback.java5
1 files changed, 1 insertions, 4 deletions
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 @@ package com.android.phone.common;
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 class HapticFeedback {
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();