diff options
| author | 2014-09-29 18:24:03 +0000 | |
|---|---|---|
| committer | 2014-09-29 18:24:04 +0000 | |
| commit | 28d01e677c05edaa45456a26dff22d1b0fc28164 (patch) | |
| tree | 1610c5be077648ddabcaaecc9b94feaf18eb3864 | |
| parent | 5913f40618494a361b4cc0c79aebdd2f0a9170da (diff) | |
| parent | 267874622e43a99474defbe4d07ace78e76bb690 (diff) | |
Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
| -rw-r--r-- | services/core/java/com/android/server/notification/NotificationManagerService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index f53445af560b..7e683610ead4 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -43,6 +43,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.res.Configuration; import android.content.res.Resources; import android.database.ContentObserver; import android.graphics.Bitmap; @@ -2013,7 +2014,10 @@ public class NotificationManagerService extends SystemService { if ((useDefaultVibrate || convertSoundToVibration || hasCustomVibrate) && !(mAudioManager.getRingerMode() - == AudioManager.RINGER_MODE_SILENT)) { + == AudioManager.RINGER_MODE_SILENT) + // HACK for klp-modular devices only: disable vibration on watches. + && ((getContext().getResources().getConfiguration().uiMode & + Configuration.UI_MODE_TYPE_WATCH) == 0)) { mVibrateNotification = r; if (useDefaultVibrate || convertSoundToVibration) { |