Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3857fad authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Fix crash after revoking all app permissions 

Bug: 32147415

Test: follow steps to repro in b/32147415.

Change-Id: Ib7c63ef86299b6d18ad3e9c80fe4e350cf3102d5
parent 5f3c81ed

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

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import android.util.Log; 


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 @@ public class ProviderStatusWatcher extends ContentObserver { 
                    }

                }

                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

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment 
    }



    private void setDirectorySearchMode() {

        if (mContactsRequest.isDirectorySearchEnabled()) {

        if (mContactsRequest != null && mContactsRequest.isDirectorySearchEnabled()) {

            setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DEFAULT);

        } else {

            setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_NONE);