summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-01-30 14:02:18 -0800
committerJay Shrauner <shrauner@google.com>2014-01-30 15:38:14 -0800
commit1f44ffc294764250cb1e02290fabdc439126dc19 (patch)
tree86ad27bf6efa18449c04510646739b577bdd3cb6 /src/com/android/contacts/common/list/ProfileAndContactsLoader.java
parent4c81610029b83e65afdfc418b812a267d492efd6 (diff)
downloadandroid_packages_apps_ContactsCommon-1f44ffc294764250cb1e02290fabdc439126dc19.tar.gz
android_packages_apps_ContactsCommon-1f44ffc294764250cb1e02290fabdc439126dc19.tar.bz2
android_packages_apps_ContactsCommon-1f44ffc294764250cb1e02290fabdc439126dc19.zip
Fix NPE if contactsCursor is null
Don't crash if the CP2 call failed and we were unable to load the contacts cursor. Bug:12822702 Change-Id: Ib6b3cf5a9519d61c82924f29babb146888f7453a
Diffstat (limited to 'src/com/android/contacts/common/list/ProfileAndContactsLoader.java')
-rw-r--r--src/com/android/contacts/common/list/ProfileAndContactsLoader.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
index e31b8ecc..76715dbb 100644
--- a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
+++ b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java
@@ -64,7 +64,7 @@ public class ProfileAndContactsLoader extends CursorLoader {
@Override
public Bundle getExtras() {
// Need to get the extras from the contacts cursor.
- return contactsCursor.getExtras();
+ return contactsCursor == null ? new Bundle() : contactsCursor.getExtras();
}
};
}