summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-04-29 14:36:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 14:36:23 +0000
commitd1a32bada1f3103973ad548c2fb65110c531798b (patch)
tree2fc23527898212f577e07c823feb0d3ade6d352f /media
parente727b57ea518534515fe20c85d73b95c7a9161f3 (diff)
parent23e46a4e8d9405e24169a0bb38ff6dc5b8d99ff2 (diff)
downloadframeworks_base-d1a32bada1f3103973ad548c2fb65110c531798b.zip
frameworks_base-d1a32bada1f3103973ad548c2fb65110c531798b.tar.gz
frameworks_base-d1a32bada1f3103973ad548c2fb65110c531798b.tar.bz2
am 23e46a4e: am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
* commit '23e46a4e8d9405e24169a0bb38ff6dc5b8d99ff2': 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();
}
}