summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-04-29 14:27:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 14:27:19 +0000
commit23e46a4e8d9405e24169a0bb38ff6dc5b8d99ff2 (patch)
tree84527c174c7f49e0baf8ea58496ad0489c719a7f /media
parent41646474df175d74545429d2f2c1a3f08d97341c (diff)
parent2d67b2887c0a279aa182646f0e23b176783a1aca (diff)
downloadframeworks_base-23e46a4e8d9405e24169a0bb38ff6dc5b8d99ff2.zip
frameworks_base-23e46a4e8d9405e24169a0bb38ff6dc5b8d99ff2.tar.gz
frameworks_base-23e46a4e8d9405e24169a0bb38ff6dc5b8d99ff2.tar.bz2
am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
* commit '2d67b2887c0a279aa182646f0e23b176783a1aca': Volume: Simple dialog footer, DND in quick settings.
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/AudioManagerInternal.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/java/android/media/AudioManagerInternal.java b/media/java/android/media/AudioManagerInternal.java
index abb4257..a721923 100644
--- a/media/java/android/media/AudioManagerInternal.java
+++ b/media/java/android/media/AudioManagerInternal.java
@@ -51,5 +51,7 @@ public abstract class AudioManagerInternal {
/** Called when internal ringer mode is evaluated, returns the new external ringer mode */
int onSetRingerModeInternal(int ringerModeOld, int ringerModeNew, String caller,
int ringerModeExternal, VolumePolicy policy);
+
+ boolean canVolumeDownEnterSilent();
}
}