diff options
| author | Selim Cinek <cinek@google.com> | 2015-08-26 18:25:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-26 18:25:07 +0000 |
| commit | e67268e66d5507832fa0c53dc7e08a72662610bc (patch) | |
| tree | 072639e88005239daf9ffd8b09581406ca076ead /services/core | |
| parent | 8ff73b596e7c59f32a3f0df503ae8a9e5adbced5 (diff) | |
| parent | 69ff8afceea53851f339bd1dd755ed6f8915692c (diff) | |
| download | frameworks_base-e67268e66d5507832fa0c53dc7e08a72662610bc.zip frameworks_base-e67268e66d5507832fa0c53dc7e08a72662610bc.tar.gz frameworks_base-e67268e66d5507832fa0c53dc7e08a72662610bc.tar.bz2 | |
Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/GestureLauncherService.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index 0fb0470..38ba793 100644 --- a/services/core/java/com/android/server/GestureLauncherService.java +++ b/services/core/java/com/android/server/GestureLauncherService.java @@ -53,7 +53,6 @@ class GestureLauncherService extends SystemService { private final GestureEventListener mGestureListener = new GestureEventListener(); private Sensor mCameraLaunchSensor; - private Vibrator mVibrator; private Context mContext; /** The wake lock held when a gesture is detected. */ @@ -78,7 +77,6 @@ class GestureLauncherService extends SystemService { return; } - mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE); PowerManager powerManager = (PowerManager) mContext.getSystemService( Context.POWER_SERVICE); mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, @@ -222,16 +220,12 @@ class GestureLauncherService extends SystemService { "userSetupComplete = %s, performing camera launch gesture.", userSetupComplete)); - if (mVibrator != null && mVibrator.hasVibrator()) { - mVibrator.vibrate(1000L); - } // Make sure we don't sleep too early mWakeLock.acquire(500L); StatusBarManagerInternal service = LocalServices.getService( StatusBarManagerInternal.class); service.onCameraLaunchGestureDetected(); mWakeLock.release(); - } @Override |