commit 1ebaff2a4be5b38da73d86befca4c6c08d507162
author Jay Shrauner <shrauner@google.com> Thu Mar 12 15:24:16 2015 -0700
committer Jay Shrauner <shrauner@google.com> Fri Mar 13 14:28:50 2015 -0700
tree 8710daa3bf25c6683e2288d94e4e4b0ac6904aaf
parent 4011e209215d19a1633ed5d1643f3b7643001667

Check for empty lookup keys in getLookupUri

Bug:19588470
Change-Id: I5379e0b16dbec7692ef86ca8a21b0eae2aa47819

core/java/android/provider/ContactsContract.java

diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 91a19dc..3b4faa3 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -1516,8 +1516,14 @@
         /**
          * Build a {@link #CONTENT_LOOKUP_URI} lookup {@link Uri} using the
          * given {@link ContactsContract.Contacts#_ID} and {@link #LOOKUP_KEY}.
+         * <p>
+         * Returns null if unable to construct a valid lookup URI from the
+         * provided parameters.
          */
         public static Uri getLookupUri(long contactId, String lookupKey) {
+            if (TextUtils.isEmpty(lookupKey)) {
+                return null;
+            }
             return ContentUris.withAppendedId(Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI,
                     lookupKey), contactId);
         }