diff options
author | Sarmad Hashmi <mhashmi@google.com> | 2016-01-25 17:35:36 -0800 |
---|---|---|
committer | Brandon Maxwell <maxwelb@google.com> | 2016-03-15 12:31:12 -0700 |
commit | ba0d51222597bc5e5ef8b9074097cf12950aad64 (patch) | |
tree | d47e8e5f0d72beb8cc9ac3072a3d7b1544eb5673 /src/com/android/dialer/calllog/CallLogFragment.java | |
parent | 82f68703ec819b2d9b24766e1abd019784032824 (diff) |
Fixing build
+ A merge was performed improperly which caused an import to be
removed, but the code using the imported object wasn't. This resulted
in build failures since the necessary class wasn't imported.
+ This change properly performs the merge of
cdc14da9275c67d123b55e668f48f73c4b58d948.
Change-Id: Ifb78cc75aff18a9c632c7c5e1a3121858383296a
Diffstat (limited to 'src/com/android/dialer/calllog/CallLogFragment.java')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogFragment.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index 07299a2fb..d258a8c46 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -473,9 +473,13 @@ public class CallLogFragment extends Fragment implements CallLogQueryHandler.Lis // We don't want to update any call data when keyguard is on because the user has likely not // seen the new calls yet. // This might be called before onCreate() and thus we need to check null explicitly. - if (mKeyguardManager != null && !mKeyguardManager.inKeyguardRestrictedInputMode() - && mCallTypeFilter == Calls.VOICEMAIL_TYPE) { - CallLogNotificationsHelper.updateVoicemailNotifications(getActivity()); + if (mKeyguardManager != null && !mKeyguardManager.inKeyguardRestrictedInputMode()) { + // On either of the transitions we update the missed call and voicemail notifications. + // While exiting we additionally consume all missed calls (by marking them as read). + mCallLogQueryHandler.markNewCallsAsOld(); + if (mCallTypeFilter == Calls.VOICEMAIL_TYPE) { + CallLogNotificationsHelper.updateVoicemailNotifications(getActivity()); + } } } |