diff options
author | Sarmad Hashmi <mhashmi@google.com> | 2016-03-30 18:10:41 -0700 |
---|---|---|
committer | Sarmad Hashmi <mhashmi@google.com> | 2016-03-30 18:10:41 -0700 |
commit | ec4ae9c7ecaa477d81f3097c8e0ae212155a61f7 (patch) | |
tree | 9a020167f57bfd72d9178322f6a9e3bffd1a4151 | |
parent | b804a67a037bce1fae7f7f81251f60ce82ba54fa (diff) |
Fix merge.
+Remove line that was removed by ag/874074 and added back in by
ag/886674.
Change-Id: I8f501655356ccf5ff605a0eb705ec38e1ded9025
-rw-r--r-- | src/com/android/dialer/calllog/CallLogFragment.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index d01537dea..67b72a5a3 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -474,13 +474,9 @@ 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()) { - // 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()); - } + if (mKeyguardManager != null && !mKeyguardManager.inKeyguardRestrictedInputMode() + && mCallTypeFilter == Calls.VOICEMAIL_TYPE) { + CallLogNotificationsHelper.updateVoicemailNotifications(getActivity()); } } |