diff options
author | calderwoodra <calderwoodra@google.com> | 2018-03-01 03:03:14 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-03-01 03:03:14 +0000 |
commit | 1716a7ce47166e075edf327f5708dcc4f875c1ad (patch) | |
tree | 08e0771de9372df6755297b470eeb2ace50b78fa /java/com/android/dialer/app/calllog | |
parent | 3c3349a8c3b5f661f974b967e5aac79d0b6ebb5f (diff) | |
parent | db6add40705a07d857257a29e84a81d384ea0d6d (diff) | |
download | android_packages_apps_Dialer-1716a7ce47166e075edf327f5708dcc4f875c1ad.tar.gz android_packages_apps_Dialer-1716a7ce47166e075edf327f5708dcc4f875c1ad.tar.bz2 android_packages_apps_Dialer-1716a7ce47166e075edf327f5708dcc4f875c1ad.zip |
Merge changes Iae86dabb,I1db81304 am: a109ed80be am: b61c137f0b
am: db6add4070
Change-Id: I17180418a3ccaec406a91a6cb6c86d29e4434968
Diffstat (limited to 'java/com/android/dialer/app/calllog')
-rw-r--r-- | java/com/android/dialer/app/calllog/CallLogFragment.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java index 11c249944..7e49cc965 100644 --- a/java/com/android/dialer/app/calllog/CallLogFragment.java +++ b/java/com/android/dialer/app/calllog/CallLogFragment.java @@ -222,18 +222,6 @@ public class CallLogFragment extends Fragment final Activity activity = getActivity(); final ContentResolver resolver = activity.getContentResolver(); callLogQueryHandler = new CallLogQueryHandler(activity, resolver, this, logLimit); - - if (PermissionsUtil.hasCallLogReadPermissions(getContext())) { - resolver.registerContentObserver(CallLog.CONTENT_URI, true, callLogObserver); - } else { - LogUtil.w("CallLogFragment.onCreate", "call log permission not available"); - } - if (PermissionsUtil.hasContactsReadPermissions(getContext())) { - resolver.registerContentObserver( - ContactsContract.Contacts.CONTENT_URI, true, contactsObserver); - } else { - LogUtil.w("CallLogFragment.onCreate", "contacts permission not available."); - } setHasOptionsMenu(true); } @@ -412,6 +400,19 @@ public class CallLogFragment extends Fragment updateEmptyMessage(callTypeFilter); } + ContentResolver resolver = getActivity().getContentResolver(); + if (PermissionsUtil.hasCallLogReadPermissions(getContext())) { + resolver.registerContentObserver(CallLog.CONTENT_URI, true, callLogObserver); + } else { + LogUtil.w("CallLogFragment.onCreate", "call log permission not available"); + } + if (PermissionsUtil.hasContactsReadPermissions(getContext())) { + resolver.registerContentObserver( + ContactsContract.Contacts.CONTENT_URI, true, contactsObserver); + } else { + LogUtil.w("CallLogFragment.onCreate", "contacts permission not available."); + } + this.hasReadCallLogPermission = hasReadCallLogPermission; /* @@ -432,6 +433,8 @@ public class CallLogFragment extends Fragment @Override public void onPause() { LogUtil.enterBlock("CallLogFragment.onPause"); + getActivity().getContentResolver().unregisterContentObserver(callLogObserver); + getActivity().getContentResolver().unregisterContentObserver(contactsObserver); if (getUserVisibleHint()) { onNotVisible(); } @@ -465,9 +468,6 @@ public class CallLogFragment extends Fragment if (adapter != null) { adapter.changeCursor(null); } - - getActivity().getContentResolver().unregisterContentObserver(callLogObserver); - getActivity().getContentResolver().unregisterContentObserver(contactsObserver); super.onDestroy(); } |