diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-07-20 11:41:02 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2014-07-20 20:58:47 +0000 |
| commit | 89c3b29a9bfa0ae9858b913bc1ab6604c4613a15 (patch) | |
| tree | 4a6b48a4bdcf3936157c137f47912c98c6c1b2e9 /services | |
| parent | 7226b9b62d9c26eda9e2353e8ce35808e51c3fd3 (diff) | |
| download | frameworks_base-89c3b29a9bfa0ae9858b913bc1ab6604c4613a15.zip frameworks_base-89c3b29a9bfa0ae9858b913bc1ab6604c4613a15.tar.gz frameworks_base-89c3b29a9bfa0ae9858b913bc1ab6604c4613a15.tar.bz2 | |
Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
AudioAttributes: rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE to
USAGE_NOTIFICATION_RINGTONE in the list of usage values.
Temporarily keep the old definition to prevent transient build
breakages, will be removed after telephony packages have been
updated.
Bug 16401631
Change-Id: I9398443fd7ba3c30e9d371c5c5a2934b9ea6f30a
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/VibratorService.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/notification/ZenModeHelper.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java index 51be98a..248a303 100644 --- a/services/core/java/com/android/server/VibratorService.java +++ b/services/core/java/com/android/server/VibratorService.java @@ -373,7 +373,7 @@ public class VibratorService extends IVibratorService.Stub private void startVibrationLocked(final Vibration vib) { try { if (mLowPowerMode - && vib.mUsageHint != AudioAttributes.USAGE_NOTIFICATION_TELEPHONY_RINGTONE) { + && vib.mUsageHint != AudioAttributes.USAGE_NOTIFICATION_RINGTONE) { return; } diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 7e82ce5..8e625c5 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -17,7 +17,7 @@ package com.android.server.notification; import static android.media.AudioAttributes.USAGE_ALARM; -import static android.media.AudioAttributes.USAGE_NOTIFICATION_TELEPHONY_RINGTONE; +import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE; import static android.media.AudioAttributes.USAGE_UNKNOWN; import android.app.AlarmManager; @@ -197,10 +197,10 @@ public class ZenModeHelper { // call restrictions final boolean muteCalls = zen && !mConfig.allowCalls; - mAppOps.setRestriction(AppOpsManager.OP_VIBRATE, USAGE_NOTIFICATION_TELEPHONY_RINGTONE, + mAppOps.setRestriction(AppOpsManager.OP_VIBRATE, USAGE_NOTIFICATION_RINGTONE, muteCalls ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED, exceptionPackages); - mAppOps.setRestriction(AppOpsManager.OP_PLAY_AUDIO, USAGE_NOTIFICATION_TELEPHONY_RINGTONE, + mAppOps.setRestriction(AppOpsManager.OP_PLAY_AUDIO, USAGE_NOTIFICATION_RINGTONE, muteCalls ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED, exceptionPackages); |