Merge "Add invalid id check to isValidParent" into honeycomb-mr1
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index c6b1bc7..305c794 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -1236,6 +1236,9 @@
private boolean isValidParent(String accountType, String accountName,
long parentId) {
+ if (parentId <= 0) {
+ return false;
+ }
Uri uri = ContentUris.withAppendedId(Bookmarks.CONTENT_URI, parentId);
Cursor c = query(uri,
new String[] { Bookmarks.ACCOUNT_NAME, Bookmarks.ACCOUNT_TYPE },