diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-08-11 12:46:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-11 12:46:25 -0700 |
| commit | 4dbd1bc6ae84cb4d0cd28922e917473ec6e53517 (patch) | |
| tree | f95735fb89d33b10eac238a5b5e0aa4d0327f087 /core | |
| parent | e30af493a68391cc37891c56a5dd4fcfccffe9fc (diff) | |
| parent | 5f07406717db34927f5095de3829b1e74ebd7c16 (diff) | |
| download | frameworks_base-4dbd1bc6ae84cb4d0cd28922e917473ec6e53517.zip frameworks_base-4dbd1bc6ae84cb4d0cd28922e917473ec6e53517.tar.gz frameworks_base-4dbd1bc6ae84cb4d0cd28922e917473ec6e53517.tar.bz2 | |
am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '5f07406717db34927f5095de3829b1e74ebd7c16':
VolumePreference.onActivityStop only stops playback
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/preference/VolumePreference.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/preference/VolumePreference.java b/core/java/android/preference/VolumePreference.java index 970d520..0219fe8 100644 --- a/core/java/android/preference/VolumePreference.java +++ b/core/java/android/preference/VolumePreference.java @@ -109,7 +109,9 @@ public class VolumePreference extends SeekBarPreference implements } public void onActivityStop() { - cleanup(); + if (mSeekBarVolumizer != null) { + mSeekBarVolumizer.stopSample(); + } } /** |