commit 048bb429e927ce734c6ebbcac4a9035bcd9ec3e5
author John Spurlock <jspurlock@google.com> Mon Sep 08 20:51:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 08 20:51:01 2014 +0000
tree 3e14633d221fbba5de4d63228103b2ee0a00027d
parent e9c595a402f42bfef4a3c99f33cc63b44666af24
parent 897b01b39e6fc4478956f649253a1c14330c9fdf

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

* commit 'e5feafcd1589bf6e92669df82a545276fa4ab29b':
  Zen: Remove suppression of untagged vibrations in zen mode.

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

diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index 168328f..5639dad 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -18,7 +18,6 @@
 
 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 @@
                 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,