| commit | a623ed78c0bba1826f29d53167ad483325d66dca | [log] [tgz] |
|---|---|---|
| author | erfanian <erfanian@google.com> | Thu Jun 21 16:16:56 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 21 16:16:56 2018 -0700 |
| tree | 4c9609c8da017443d1bebd4c6a5a82d447cbc30d | |
| parent | 2423023cc0da0c211c9d40e617bd92eeb3367a71 [diff] | |
| parent | 1432364e3e36a8243f5a96a219e91ecb60ef65a1 [diff] |
Merge "Use context only after it is available." am: 1432364e3e Change-Id: If79aaaa0978e8801ecfdfa6d1fcca38e5dc919e2
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();