| commit | 1432364e3e36a8243f5a96a219e91ecb60ef65a1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 21 23:14:39 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jun 21 23:14:39 2018 +0000 |
| tree | e0310cba619c3267d615a51a42d9b146871d1733 | |
| parent | 3d97f592b5902b885dfe47e700b8e960047a090b [diff] | |
| parent | cda290995783e09079df80a0ca5279887d5f37e1 [diff] |
Merge "Use context only after it is available."
diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java index 5417fcf..fd6db75 100644 --- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java +++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
@@ -275,7 +275,8 @@ return false; } - if (PermissionsUtil.hasLocationPermissions(getContext()) + if (getContext() == null + || PermissionsUtil.hasLocationPermissions(getContext()) || hasBeenDismissed() || !isRegularSearch()) { adapter.hideLocationPermissionRequest();