commit 032560017404fd778dfb8a72674eb5e9fd35332f
author Nicholas Sauer <nicksauer@google.com> Mon Jul 24 07:41:06 2017 -0700
committer Nicholas Sauer <nicksauer@google.com> Mon Jul 24 16:42:59 2017 +0000
tree bc1bac5cfc91a5c02e96ac7f49f501d8b463341f
parent 6148c31a0a666604a8a2a6e638dee3bda1554148

Check for null results from getTypeForAccount.

bug: 63816624
Test: make Contacts and install. No crash.

Change-Id: Ic4f00413d196ff783d033740e0efb1c82c10e361
(cherry picked from commit d9ecda94ff66021247bde802757353b20ee6b7c8)

src/com/android/contacts/model/AccountTypeManager.java

diff --git a/src/com/android/contacts/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
index b442e4f..9938695 100644
--- a/src/com/android/contacts/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -622,9 +622,10 @@
             final AccountWithDataSet accountWithDataSet = new AccountWithDataSet(
                     account.name, account.type, null);
             final AccountType type = mTypeProvider.getTypeForAccount(accountWithDataSet);
-
-            // Accounts with a dataSet (e.g. Google plus accounts) are not writable.
-            result.add(type.wrapAccount(mContext, accountWithDataSet));
+            if (type != null) {
+                // Accounts with a dataSet (e.g. Google plus accounts) are not writable.
+                result.add(type.wrapAccount(mContext, accountWithDataSet));
+            }
         }
         return result;
     }