commit 1f48f4cf893c6463042f5ff81d5a7ee86348b60c
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 20 09:11:28 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Aug 20 09:11:29 2012 -0700
tree 2dcf8bccb821c3f205fc6202f972a1d5e491e390
parent 16c9ad253c8f1e30b543847b10a312d908f9de5d
parent 4732e676e10f22796826dabb916645808561c82a

Merge "Null pointer protection in AudioPreview.java for 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);