Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev

This commit is contained in:
John Spurlock
2014-09-08 20:40:45 +00:00
committed by Android (Google) Code Review

View File

@@ -18,7 +18,6 @@ package com.android.server.notification;
import static android.media.AudioAttributes.USAGE_ALARM;
import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;
import static android.media.AudioAttributes.USAGE_UNKNOWN;
import android.app.AppOpsManager;
import android.app.Notification;
@@ -225,11 +224,6 @@ public class ZenModeHelper {
muteCalls ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED,
exceptionPackages);
// restrict vibrations with no hints
mAppOps.setRestriction(AppOpsManager.OP_VIBRATE, USAGE_UNKNOWN,
zen ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED,
exceptionPackages);
// alarm restrictions
final boolean muteAlarms = mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS;
mAppOps.setRestriction(AppOpsManager.OP_VIBRATE, USAGE_ALARM,