summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-10-13 04:50:57 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-10-13 04:50:57 -0700
commit7d1a3fc67c07243bc784a7a4b3893acab0dfd4cf (patch)
tree074156577b057a43a6f7f2821f28c976f4d054b0 /src
parent2a0e1ad8bc86069861b8218bce8bccfa0276a5b3 (diff)
parentaf2f2262eefa2da25ba6c1d15e56dcc4cb66ae97 (diff)
downloadandroid_packages_apps_Gallery2-7d1a3fc67c07243bc784a7a4b3893acab0dfd4cf.tar.gz
android_packages_apps_Gallery2-7d1a3fc67c07243bc784a7a4b3893acab0dfd4cf.tar.bz2
android_packages_apps_Gallery2-7d1a3fc67c07243bc784a7a4b3893acab0dfd4cf.zip
Merge "Get speaker status & set UI properly." into ui_dev_2.0
Diffstat (limited to 'src')
-rw-r--r--src/org/codeaurora/gallery3d/video/SpeakerHooker.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java b/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
index 6e7887a69..1592195f7 100644
--- a/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
+++ b/src/org/codeaurora/gallery3d/video/SpeakerHooker.java
@@ -197,11 +197,8 @@ public class SpeakerHooker extends MovieHooker {
}
private boolean isSpeakerOn() {
- boolean isSpeakerOn = false;
- if (mAudioManager == null) {
- initAudioManager();
- }
- isSpeakerOn = mAudioManager.isSpeakerphoneOn();
+ boolean isSpeakerOn = (AudioSystem.FORCE_SPEAKER
+ == AudioSystem.getForceUse(AudioSystem.FOR_MEDIA)) ? true : false;
return isSpeakerOn;
}