am 5f07406: am 712a8cc: Merge "VolumePreference.onActivityStop only stops playback"

Amith Yamasani · Android Git Automerger · commit 4dbd1bc6ae84 · 2011-08-11T12:46:25.000-07:00
* commit '5f07406717db34927f5095de3829b1e74ebd7c16':
  VolumePreference.onActivityStop only stops playback
diff --git a/core/java/android/preference/VolumePreference.java b/core/java/android/preference/VolumePreference.java
@@ -109,7 +109,9 @@ protected void onDialogClosed(boolean positiveResult) {
     }
 
     public void onActivityStop() {
-        cleanup();
+        if (mSeekBarVolumizer != null) {
+            mSeekBarVolumizer.stopSample();
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,9 @@ protected void onDialogClosed(boolean positiveResult) {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public void onActivityStop() {`
`112`		`- cleanup();`
	`112`	`+ if (mSeekBarVolumizer != null) {`
	`113`	`+ mSeekBarVolumizer.stopSample();`
	`114`	`+ }`
`113`	`115`	`}`
`114`	`116`
`115`	`117`	`/**`