commit 591d6d77ccc242fcd4678141102531f093cd2a4f
author Jeffrey Sharkey Fri Mar 27 19:45:21 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Mar 27 19:45:21 2009 -0700
tree a0b4f256b28d0e3f5416012f64800575c1d25b4b
parent 083b210af94b77e9ec9f1cbc3e9fa163f3860f99

AI 143232: am: CL 143057 Don't NPE when editing a folder name.
  Only happens when user changes orientation while editing, where getFolderById can return the wrong folder type for the given ID.
  Original author: jsharkey
  Merged from: //branches/cupcake/...

Automated import of CL 143232

src/com/android/launcher/LauncherModel.java

diff --git a/src/com/android/launcher/LauncherModel.java b/src/com/android/launcher/LauncherModel.java
index e302081..b6c90a2 100644
--- a/src/com/android/launcher/LauncherModel.java
+++ b/src/com/android/launcher/LauncherModel.java
@@ -1243,7 +1243,7 @@
     FolderInfo getFolderById(Context context, long id) {
         final ContentResolver cr = context.getContentResolver();
         Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI, null,
-                "_id=? and itemType=? or itemType=?",
+                "_id=? and (itemType=? or itemType=?)",
                 new String[] { String.valueOf(id),
                         String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER),
                         String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER) }, null);