commit db14e45b09886c7589c35a83fcec76c85ae3abb3
author Axesh  R. Ajmera <aajmera@codeaurora.org> Wed Jan 21 17:42:59 2015 -0800
committer Axesh  R. Ajmera <aajmera@codeaurora.org> Wed Jan 21 17:58:45 2015 -0800
tree 7ce48fa80522706f6295e9104766f4f1cebb600d
parent 32d60263f8ac07d6aaecd1bcd5399e9e1d657eff

Fix NPE when checking for title of Bookmarks
and getting BrowserPreferences

Change-Id: I28bd80be7ffbbf268f085d9944c67c4016452a79

src/com/android/browser/AddBookmarkPage.java

diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 9d757d4..56a2f97 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -657,8 +657,11 @@
             mTouchIconUrl = mMap.getString(TOUCH_ICON_URL);
             mCurrentFolder = mMap.getLong(BrowserContract.Bookmarks.PARENT, DEFAULT_FOLDER_ID);
 
-            if (title.length() > MAX_TITLE_LENGTH) {
-                title = title.substring(0, MAX_TITLE_LENGTH);
+            // Check if  title is not empty to prevent NPE
+            if (!TextUtils.isEmpty(title)) {
+                if (title.length() > MAX_TITLE_LENGTH) {
+                    title = title.substring(0, MAX_TITLE_LENGTH);
+                }
             }
         }