commit ef046f319da1f92732a5edafa0b0c79b31e2716b
author Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 12:45:04 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 12:45:04 2009 -0700
tree e949942544bd914605158d033279f86ad2dbb75f
parent 93267d9521d0b5099f95afe2eaff32b8bf1f8cc8
parent 6c615a208d88fe49c7da43c59720f9db6ca1e964

Merge change 3753 into donut

* changes:
  Fix NPE in music app.

src/com/android/music/MediaPlaybackService.java

diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 995a050..f44d5f3 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -400,8 +400,8 @@
             // the same one as when the playlist was saved
             q = mPreferences.getString("queue", "");
         }
-        int qlen = q.length();
-        if (q != null && qlen > 1) {
+        int qlen = q != null ? q.length() : 0;
+        if (qlen > 1) {
             //Log.i("@@@@ service", "loaded queue: " + q);
             int plen = 0;
             int n = 0;