commit 3867a0ac286d0c9cc457b81e9db5d36019e786e4
author Nancy Chen <nancychen@google.com> Wed Oct 21 21:15:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 21 21:15:30 2015 +0000
tree 8a97e9fea8fbcb2e5d136272b629969b487ee077
parent 826a1350722e9da5867430c217b974aae225adb8
parent 687390732d6253903141d89d734113373d0e3c13

Merge "New layout for business call context." into ub-contactsdialer-a-dev

InCallUI/src/com/android/incallui/InCallPresenter.java

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 59876c2..0e2edd2 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -50,6 +50,7 @@
 import com.android.dialer.calllog.CallLogAsyncTaskUtil.OnCallLogQueryFinishedListener;
 import com.android.dialer.database.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnCheckBlockedListener;
+import com.android.dialer.filterednumber.FilteredNumbersUtil;
 import com.android.incallui.util.TelecomCallUtil;
 import com.android.incalluibind.ObjectFactory;
 import com.google.common.base.Preconditions;
@@ -491,6 +492,7 @@
     public void onCallAdded(final android.telecom.Call call) {
         // Check if call should be blocked.
         if (!TelecomCallUtil.isEmergencyCall(call)
+                && !FilteredNumbersUtil.hasRecentEmergencyCall(mContext)
                 && call.getState() == android.telecom.Call.STATE_RINGING) {
             maybeBlockCall(call);
         } else {
@@ -654,6 +656,10 @@
         if (isActivityStarted()) {
             mInCallActivity.dismissKeyguard(false);
         }
+
+        if (call.isEmergencyCall()) {
+            FilteredNumbersUtil.recordLastEmergencyCallTime(mContext);
+        }
     }
 
     /**