diff options
| author | Joe Onorato <joeo@google.com> | 2011-12-14 21:08:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-14 21:08:03 -0800 |
| commit | 2e7cfe4a2f75059ab509135378b171b6c3625d9e (patch) | |
| tree | b7b7d30e692daed890f0b2e8aa81274e355a095e /media | |
| parent | 965e2c638b32cd771769cd1cc1fb99e5bda08370 (diff) | |
| parent | b782e8d71e693984cc5236f1cf08e0c3c11a4050 (diff) | |
| download | frameworks_base-2e7cfe4a2f75059ab509135378b171b6c3625d9e.zip frameworks_base-2e7cfe4a2f75059ab509135378b171b6c3625d9e.tar.gz frameworks_base-2e7cfe4a2f75059ab509135378b171b6c3625d9e.tar.bz2 | |
Merge "logging" into ics-aah
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioManager.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/AudioService.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index b253ec3..1e0a0b5 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -540,6 +540,8 @@ public class AudioManager { public void adjustStreamVolume(int streamType, int direction, int flags) { IAudioService service = getService(); try { + Log.d(TAG, "adjustStreamVolume mUseMasterVolume=" + mUseMasterVolume + + " direction=" + direction + " flags=0x" + Integer.toHexString(flags)); if (mUseMasterVolume) { service.adjustMasterVolume(direction, flags); } else { diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 2761640..886d26c 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -600,6 +600,7 @@ public class AudioService extends IAudioService.Stub { ensureValidDirection(direction); float volume = AudioSystem.getMasterVolume(); + Log.d(TAG, "adjustMasterVolume old=" + volume); if (volume >= 0.0) { // get current master volume adjusted to 0 to 100 int oldVolume = getMasterVolume(); @@ -616,6 +617,7 @@ public class AudioService extends IAudioService.Stub { Binder.restoreCallingIdentity(origCallerIdentityToken); sendMasterVolumeUpdate(flags, oldVolume, getMasterVolume()); } + Log.d(TAG, "adjustMasterVolume new=" + volume); } /** @see AudioManager#setStreamVolume(int, int, int) */ |