commit 6f57f0056fb8ffbc8f0cfc8fdc0570f459dff8d9
author Marco Nelissen <marcone@google.com> Thu Oct 25 11:20:52 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 25 11:20:52 2012 -0700
tree 7993827ca293c28033ed4d2f099bbb172a6f0d17
parent c76525efc451f816c5b7b96b353e5fdf79e452e0
parent cb395324fe5862a8a4b82a967822aeaf83e0fabb

am cb395324: am 0b8ca377: Merge "Crash when no item selected in ControlPanelPicker"

* commit 'cb395324fe5862a8a4b82a967822aeaf83e0fabb':
  Crash when no item selected in ControlPanelPicker

src/com/android/musicfx/ControlPanelPicker.java

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 @@
 public class ControlPanelPicker extends AlertActivity implements OnClickListener, OnPrepareListViewListener {
 
     
-    int mClickedPos = -1;
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
@@ -97,7 +96,7 @@
 
         public void onClick(DialogInterface dialog, int which) {
             // Save the position of most recently clicked item
-            mClickedPos = which;
+            mAlertParams.mCheckedItem = which;
         }
         
     };
@@ -108,7 +107,7 @@
             // 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);