commit 1f537fb963cf436cfb7962c2e87bebe88432f598
author Jean-Baptiste Queru <jbq@google.com> Thu Aug 16 18:47:04 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 16 18:47:04 2012 -0700
tree a7d0743e6bbc29075eb00fced8058a4a5973f8a4
parent 6f9c467fcee1f2d722f089013ee3261bdec7a48b
parent 626f47889e840486b10259712a937b843af466da

am 626f4788: am 16c9ad25: Merge "Fix JAVACRASH happens when press down key by keypad in music app"

* commit '626f47889e840486b10259712a937b843af466da':
  Fix JAVACRASH happens when press down key by keypad in music app

src/com/android/music/TrackBrowserActivity.java

diff --git a/src/com/android/music/TrackBrowserActivity.java b/src/com/android/music/TrackBrowserActivity.java
index 9f77e50..fc9b0f9 100644
--- a/src/com/android/music/TrackBrowserActivity.java
+++ b/src/com/android/music/TrackBrowserActivity.java
@@ -773,8 +773,9 @@
     // (onKeyDown never sees these events, since they are handled by the list)
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
-        if (mPlaylist != null && event.getMetaState() != 0 &&
-                event.getAction() == KeyEvent.ACTION_DOWN) {
+        int curpos = mTrackList.getSelectedItemPosition();
+        if (mPlaylist != null && !mPlaylist.equals("recentlyadded") && curpos >= 0 &&
+                event.getMetaState() != 0 && event.getAction() == KeyEvent.ACTION_DOWN) {
             switch (event.getKeyCode()) {
                 case KeyEvent.KEYCODE_DPAD_UP:
                     moveItem(true);