am 0b8ca377: Merge "Crash when no item selected in ControlPanelPicker"tools_r22jb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aosp

* commit '0b8ca377f11f5a4f25c505f29c352024f9fcc0ae':
  Crash when no item selected in ControlPanelPicker

1 files changed, 2 insertions, 3 deletions

diff --git a/src/com/android/musicfx/ControlPanelPicker.java b/src/com/android/musicfx/ControlPanelPicker.java
index a01fc36..bee9924 100644
--- a/src/com/android/musicfx/ControlPanelPicker.java
+++ b/src/com/android/musicfx/ControlPanelPicker.java
@@ -45,7 +45,6 @@ import java.util.List;
 public class ControlPanelPicker extends AlertActivity implements OnClickListener, OnPrepareListViewListener {
 
     
-    int mClickedPos = -1;
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
@@ -97,7 +96,7 @@ public class ControlPanelPicker extends AlertActivity implements OnClickListener
 
         public void onClick(DialogInterface dialog, int which) {
             // Save the position of most recently clicked item
-            mClickedPos = which;
+            mAlertParams.mCheckedItem = which;
         }
         
     };
@@ -108,7 +107,7 @@ public class ControlPanelPicker extends AlertActivity implements OnClickListener
             // set new default
             Intent updateIntent = new Intent(this, Service.class);
             Cursor c = mAlertParams.mCursor;
-            c.moveToPosition(mClickedPos);
+            c.moveToPosition(mAlertParams.mCheckedItem);
             updateIntent.putExtra("defPackage", c.getString(2));
             updateIntent.putExtra("defName", c.getString(3));
             startService(updateIntent);