am 28d01e6: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev

* commit '28d01e677c05edaa45456a26dff22d1b0fc28164':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch

Author: scrubskip

services/core/java/com/android/server/notification/NotificationManagerService.java

@@ -43,6 +43,7 @@
 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 void run() {
 
                         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) {