From 267874622e43a99474defbe4d07ace78e76bb690 Mon Sep 17 00:00:00 2001 From: Justin Koh Date: Fri, 26 Sep 2014 13:03:26 -0700 Subject: DO NOT MERGE Disable vibration from notificationmanagerservice when on watch This is a hack for this version: in a future framework version, there is an API to do this. Bug: 17646502 Change-Id: I7b46c0894c5a21189eb82efa04f2ce50ef1f927c --- .../com/android/server/notification/NotificationManagerService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) { -- cgit v1.2.3-59-g8ed1b