diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-27 17:21:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-27 17:21:27 +0000 |
| commit | 4499718cc171a6c79e03fc53e139efaf4d8ba6f8 (patch) | |
| tree | c830e73232470fc7498ffe3853c0428274e2194f /java/com/android/dialer/searchfragment | |
| parent | f60c5384f34660ae03ae3c15183980dfb8219ba9 (diff) | |
| parent | 5d8ed9309625302dee3407b320a52f2b7f30227f (diff) | |
Merge changes I6e17c1cc,If00f7e91,Ia89d5d85
* changes:
Fix HOLD option not displayed in voice calls in CDMA + GSM.
Use string concatenation for CREATE_TABLE_SQL instead of StringBuilder()
Move the functionality of DialerUtils#getDefaultSharedPreferenceForDeviceProtectedStorageContext(Context) to StorageComponent.
Diffstat (limited to 'java/com/android/dialer/searchfragment')
| -rw-r--r-- | java/com/android/dialer/searchfragment/list/NewSearchFragment.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java index c200b946c..cd42a7476 100644 --- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java +++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java @@ -68,6 +68,7 @@ import com.android.dialer.searchfragment.nearbyplaces.NearbyPlacesCursorLoader; import com.android.dialer.searchfragment.remote.RemoteContactsCursorLoader; import com.android.dialer.searchfragment.remote.RemoteDirectoriesCursorLoader; import com.android.dialer.searchfragment.remote.RemoteDirectoriesCursorLoader.Directory; +import com.android.dialer.storage.StorageComponent; import com.android.dialer.util.CallUtil; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.PermissionsUtil; @@ -355,7 +356,8 @@ public final class NewSearchFragment extends Fragment // Should not be called before remote directories (not contacts) have finished loading. private void loadNearbyPlacesCursor() { if (!PermissionsUtil.hasLocationPermissions(getContext()) - && !DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(getContext()) + && !StorageComponent.get(getContext()) + .unencryptedSharedPrefs() .getBoolean(KEY_LOCATION_PROMPT_DISMISSED, false)) { if (adapter != null && isRegularSearch() && !hasBeenDismissed()) { adapter.showLocationPermissionRequest( |