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

Amith Yamasani · Android Git Automerger · commit 648dc03cd038 · 2011-08-12T13:16:21.000-07:00
* commit '4dbd1bc6ae84cb4d0cd28922e917473ec6e53517':
  VolumePreference.onActivityStop only stops playback
diff --git a/core/java/android/preference/VolumePreference.java b/core/java/android/preference/VolumePreference.java
@@ -114,7 +114,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
`@@ -114,7 +114,9 @@ protected void onDialogClosed(boolean positiveResult) {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`public void onActivityStop() {`
`117`		`- cleanup();`
	`117`	`+ if (mSeekBarVolumizer != null) {`
	`118`	`+ mSeekBarVolumizer.stopSample();`
	`119`	`+ }`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`/**`