diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-08-12 13:16:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-12 13:16:21 -0700 |
| commit | 648dc03cd038a726b25929f9ffc142eb16e891e8 (patch) | |
| tree | 2bcddcba22ecec22cd7896931d7f28f0692c0b9c /core/java/android/preference/VolumePreference.java | |
| parent | 9903da81cb52f629bffb73748c1da5cdda921ca4 (diff) | |
| parent | 4dbd1bc6ae84cb4d0cd28922e917473ec6e53517 (diff) | |
am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '4dbd1bc6ae84cb4d0cd28922e917473ec6e53517':
VolumePreference.onActivityStop only stops playback
Diffstat (limited to 'core/java/android/preference/VolumePreference.java')
| -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 3b12780922b7..8ff5c8593468 100644 --- a/core/java/android/preference/VolumePreference.java +++ b/core/java/android/preference/VolumePreference.java @@ -114,7 +114,9 @@ public class VolumePreference extends SeekBarPreference implements } public void onActivityStop() { - cleanup(); + if (mSeekBarVolumizer != null) { + mSeekBarVolumizer.stopSample(); + } } /** |