commit ff3f120bc444922ca9feceef1e1572bb8fc63d71
author Wenyi Wang <wenyiw@google.com> Wed Nov 09 01:31:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 09 01:31:39 2016 +0000
tree 11a4b0dc14c46b9076004a65c20156af73776f66
parent 049e12f0ba4d801c9319fab5e734b2bf485076b2
parent c3857fad838de15e6bf58ccf46d10f0fdc9e3aaa

Fix crash after revoking all app permissions
am: c3857fad83

Change-Id: I8934ffe16c5403e3bac6e244ff1279da881d61a9

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 ad1a2ca..a4bfdd1 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -726,7 +726,7 @@
     }
 
     private void setDirectorySearchMode() {
-        if (mContactsRequest.isDirectorySearchEnabled()) {
+        if (mContactsRequest != null && mContactsRequest.isDirectorySearchEnabled()) {
             setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DEFAULT);
         } else {
             setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_NONE);