commit e8893b91156ee4933c403e59b085a79cc36d3159
author Maurice Chu <mochu@google.com> Tue May 15 17:09:41 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 15 17:09:41 2012 -0700
tree 0a4c9783dd53ab749bb225764c86049f1fa6311d
parent b4a0b320c9e3e617ee1dea8f210af8ac027f6795
parent 0b398b3d178d1fe8fd3ebfb9396e36d1228b53c6

Merge "Fragment carousel always starts on About page" 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);