Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Justin Koh
2014-09-29 18:24:03 +00:00
committed by Android (Google) Code Review
parent 5913f40618 267874622e
commit 28d01e677c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -43,6 +43,7 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -2013,7 +2014,10 @@ public class NotificationManagerService extends SystemService {
if ((useDefaultVibrate || convertSoundToVibration || hasCustomVibrate) if ((useDefaultVibrate || convertSoundToVibration || hasCustomVibrate)
&& !(mAudioManager.getRingerMode() && !(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; mVibrateNotification = r;
if (useDefaultVibrate || convertSoundToVibration) { if (useDefaultVibrate || convertSoundToVibration) {