diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioManager.java | 6 | ||||
| -rw-r--r-- | media/java/android/media/ClosedCaptionRenderer.java | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 912d644..07b19a4 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -1191,7 +1191,11 @@ public class AudioManager { public boolean isStreamMute(int streamType) { IAudioService service = getService(); try { - return service.isStreamMute(streamType); + if (mUseMasterVolume) { + return service.isMasterMute(); + } else { + return service.isStreamMute(streamType); + } } catch (RemoteException e) { Log.e(TAG, "Dead object in isStreamMute", e); return false; diff --git a/media/java/android/media/ClosedCaptionRenderer.java b/media/java/android/media/ClosedCaptionRenderer.java index ec33c5c..d34b21b 100644 --- a/media/java/android/media/ClosedCaptionRenderer.java +++ b/media/java/android/media/ClosedCaptionRenderer.java @@ -666,7 +666,7 @@ class CCParser { if (pac.isIndentPAC()) { moveCursorTo(pac.getRow(), pac.getCol()); } else { - moveCursorToRow(pac.getRow()); + moveCursorTo(pac.getRow(), 1); } getLineBuffer(mRow).setPACAt(mCol, pac); } |