Merge "Fix crash after revoking all app permissions" into ub-contactsdialer-h-dev (4ab7c1d4) · Commits · e / os / android_packages_apps_Contacts

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();

+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);