summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2017-01-29 12:52:56 +0100
committerZhao Wei Liew <zhaoweiliew@gmail.com>2017-02-11 01:39:02 +0000
commit17507a4804a75c43511a97e84825d7478b725ccd (patch)
treeb52c7136f9af5677947828b131c7a82c7962dc7e
parent100031ee9515c8dd3f1bcf4f066c4f8dbf59dd30 (diff)
downloadandroid_frameworks_base-17507a4804a75c43511a97e84825d7478b725ccd.tar.gz
android_frameworks_base-17507a4804a75c43511a97e84825d7478b725ccd.tar.bz2
android_frameworks_base-17507a4804a75c43511a97e84825d7478b725ccd.zip
SystemUI: Never link nofication volume on non-voice capable devices
Change-Id: Ie7866314b714d312369595d66cf0459d7f8c1c1a (cherry picked from commit 486b1788433c655d01d60e317e413cfa218c6ebc)
-rw-r--r--packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
index f1186df20f7..61f34bba9eb 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
@@ -422,6 +422,9 @@ public class VolumeDialogController {
private boolean updateLinkNotificationConfigW() {
boolean linkNotificationWithVolume = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.VOLUME_LINK_NOTIFICATION, 1) == 1;
+ if (!Util.isVoiceCapable(mContext)) {
+ return false;
+ }
if (mState.linkedNotification == linkNotificationWithVolume) {
return false;
}