commit 4ab7c1d45d2fbe943e4e62cecdbe7b911facea58
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 08 22:48:54 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 08 22:48:54 2016 +0000
tree 5dcb2a871d1f0886be6c43d548a23f5fe75d19af
parent 5b1ffdcbc5f41189f54e69c4768e3e76ba2fce05
parent c3857fad838de15e6bf58ccf46d10f0fdc9e3aaa

Merge "Fix crash after revoking all app permissions" into ub-contactsdialer-h-dev

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

diff --git a/src/com/android/contacts/common/list/ProviderStatusWatcher.java b/src/com/android/contacts/common/list/ProviderStatusWatcher.java
index 3e8e2eb..af36db3 100644
--- a/src/com/android/contacts/common/list/ProviderStatusWatcher.java
+++ b/src/com/android/contacts/common/list/ProviderStatusWatcher.java
@@ -27,6 +27,8 @@
 
 import com.android.contacts.common.compat.ProviderStatusCompat;
 
+import com.android.contactsbind.FeedbackHelper;
+
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
@@ -231,6 +233,10 @@
                     }
                 }
                 return false;
+            } catch (SecurityException e) {
+                FeedbackHelper.sendFeedback(mContext, TAG,
+                        "Security exception when querying provider status", e);
+                return false;
             } finally {
                 synchronized (mSignal) {
                     mSignal.notifyAll();

src/com/android/contacts/list/DefaultContactBrowseListFragment.java

diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 5539428..f7ae30d 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -717,7 +717,7 @@
     }
 
     private void setDirectorySearchMode() {
-        if (mContactsRequest.isDirectorySearchEnabled()) {
+        if (mContactsRequest != null && mContactsRequest.isDirectorySearchEnabled()) {
             setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DEFAULT);
         } else {
             setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_NONE);