commit 19b692ee645fc5933c52d5a6eb8b975a7da34abb
author Alon Albert <aalbert@google.com> Mon Sep 09 14:18:47 2013 -0700
committer Alon Albert <aalbert@google.com> Tue Sep 10 08:21:55 2013 -0700
tree bda45d4da5b9d6d965a4a137ea9223d37527ac0d
parent 9c85bc3a6b0e41435a5b1d86758289aa54a88975

Avoid NPE's in Extended Directories

Bug: 10676673
Change-Id: I52346b713fcab5176b6c73a158638708e623ed92

src/com/android/contacts/common/list/PhoneNumberListAdapter.java

diff --git a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
index e347e36..94c4854 100644
--- a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -114,7 +114,8 @@
         if (manager != null) {
             mExtendedDirectories = manager.getExtendedDirectories(mContext);
         } else {
-            mExtendedDirectories = null;
+            // Empty list to avoid sticky NPE's
+            mExtendedDirectories = new ArrayList<DirectoryPartition>();
         }
     }