summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Samuel Asteberg <samuel.asteberg@sonyericsson.com> 2011-02-03 14:30:58 +0100
committer Johan Redestig <johan.redestig@sonyericsson.com> 2011-02-03 14:30:58 +0100
commita458868fd432d4b106f2beddec8bdb2a65808fdb (patch)
tree8d67ecf4e7b72c498555cd92b02c13482c439926
parent8226140ccadbc8e0bdd093f8bab0a5292b9224e3 (diff)
VolumePreference.onActivityStop only stops playback
In VolumePreference.onActivityStop, the cleanup has been replaced with only stopping ringtone playback for the seekbar. This will avoid problems when switching between applications that previously lead to inconsistencies in the ring volume dialog. Change-Id: Ia751fe0893610c4f5650eb07705481400642a84e
-rw-r--r--core/java/android/preference/VolumePreference.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/preference/VolumePreference.java b/core/java/android/preference/VolumePreference.java
index 970d5202a9f3..0219fe8d3501 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();
+ }
}
/**