| commit | e86557e73b08f264a70bd035a814cfcd3fb91a64 | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Tue Mar 04 01:51:36 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 04 01:51:36 2014 +0000 |
| tree | 8416eca5813d7e2f9448aacba69c5db4b1b311f7 | |
| parent | ea87977e2d785075b77f40e5f14ffdf3968bda0b [diff] | |
| parent | e87886ebb31545bdedd464d8271c22f9ad898c91 [diff] |
Merge "Fix NPE if contactsCursor is null" into klp-dev
diff --git a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java index e31b8ec..76715db 100644 --- a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java +++ b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
@@ -64,7 +64,7 @@ @Override public Bundle getExtras() { // Need to get the extras from the contacts cursor. - return contactsCursor.getExtras(); + return contactsCursor == null ? new Bundle() : contactsCursor.getExtras(); } }; }