commit b4a0b320c9e3e617ee1dea8f210af8ac027f6795
author Makoto Onuki <omakoto@google.com> Tue May 15 17:03:42 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 15 17:03:42 2012 -0700
tree 4d5d978cc31eee93f9a8e5c0588c3f3bd9faa972
parent 1dec2e59e620434a01b27a52cdcf4d50e4524769
parent 802fa62aac8edc92be136b8227ccafa53cd774fb

Merge "Make quickcontact launchable with am" into jb-dev

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index eb5fb23..3c91716 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -197,7 +197,7 @@
         Uri lookupUri = intent.getData();
 
         // Check to see whether it comes from the old version.
-        if (LEGACY_AUTHORITY.equals(lookupUri.getAuthority())) {
+        if (lookupUri != null && LEGACY_AUTHORITY.equals(lookupUri.getAuthority())) {
             final long rawContactId = ContentUris.parseId(lookupUri);
             lookupUri = RawContacts.getContactLookupUri(getContentResolver(),
                     ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId));
@@ -207,8 +207,9 @@
 
         // Read requested parameters for displaying
         final Rect sourceBounds = intent.getSourceBounds();
-        Preconditions.checkNotNull(sourceBounds, "missing sourceBounds");
-        mFloatingLayout.setChildTargetScreen(sourceBounds);
+        if (sourceBounds != null) {
+            mFloatingLayout.setChildTargetScreen(sourceBounds);
+        }
 
         mExcludeMimes = intent.getStringArrayExtra(QuickContact.EXTRA_EXCLUDE_MIMES);