Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo

Browse Source 
Merge commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken

* commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1':
  Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
This commit is contained in:
Eric Laurent
2010-04-14 12:11:24 -07:00
committed by Android Git Automerger
parent 0476f7a063 834f0483ee
commit 5db9adfd40
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/AudioService.java
View File

@@ -1128,6 +1128,9 @@ public class AudioService extends IAudioService.Stub {
if (direction == AudioManager.ADJUST_RAISE) { if (direction == AudioManager.ADJUST_RAISE) {
// exiting silent mode // exiting silent mode
newRingerMode = AudioManager.RINGER_MODE_NORMAL; newRingerMode = AudioManager.RINGER_MODE_NORMAL;
} else {
// prevent last audible index to reach 0
adjustVolumeIndex = false;
} }
} }