summaryrefslogtreecommitdiffstats
path: root/src/com/android/dialer/list
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-01 23:07:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-01 23:07:12 +0000
commit265aafcdba82f0c7bf9b24d195f6b52138d08b48 (patch)
tree846fe90f6555ccdda4a056ba797cf06fdfaa211b /src/com/android/dialer/list
parent33cca17c91bb64147725d1d84eed92845fe572b7 (diff)
parent2a613022dbb278f0f7dd94cf49885cde9d36100c (diff)
downloadpackages_apps_Dialer-265aafcdba82f0c7bf9b24d195f6b52138d08b48.tar.gz
packages_apps_Dialer-265aafcdba82f0c7bf9b24d195f6b52138d08b48.tar.bz2
packages_apps_Dialer-265aafcdba82f0c7bf9b24d195f6b52138d08b48.zip
Merge "Restore Dialer content after permissions granted" into mnc-dev
Diffstat (limited to 'src/com/android/dialer/list')
-rw-r--r--src/com/android/dialer/list/SpeedDialFragment.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index 541cdf6e1..bf9575858 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -194,7 +194,12 @@ public class SpeedDialFragment extends Fragment implements OnItemClickListener,
super.onResume();
if (PermissionsUtil.hasContactsPermissions(getActivity())) {
- getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE).forceLoad();
+ if (getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE) == null) {
+ getLoaderManager().initLoader(LOADER_ID_CONTACT_TILE, null,
+ mContactTileLoaderListener);
+ } else {
+ getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE).forceLoad();
+ }
}
Trace.endSection();
}