From 1f12b2f2c2491504b507744eca8f2f5ab051fc8b Mon Sep 17 00:00:00 2001
From: Yu-Han Yang <yuhany@google.com>
Date: Mon, 24 May 2021 09:49:52 -0700
Subject: [PATCH] Fix isInEmergency bug

Bug: 188614063
Test: presubmit passing
Change-Id: Ic7e3694c0c6b98debcd3992c447b634acb3343b0
---
 .../server/location/injector/SystemEmergencyHelper.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java b/services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java
index aa3e5795b684b..a34d7226136a7 100644
--- a/services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java
+++ b/services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java
@@ -72,8 +72,11 @@ public class SystemEmergencyHelper extends EmergencyHelper {
 
     @Override
     public boolean isInEmergency(long extensionTimeMs) {
+        boolean isInExtensionTime = mEmergencyCallEndRealtimeMs != Long.MIN_VALUE
+                && (SystemClock.elapsedRealtime() - mEmergencyCallEndRealtimeMs) < extensionTimeMs;
+
         return mIsInEmergencyCall
-                || ((SystemClock.elapsedRealtime() - mEmergencyCallEndRealtimeMs) < extensionTimeMs)
+                || isInExtensionTime
                 || mTelephonyManager.getEmergencyCallbackMode()
                 || mTelephonyManager.isInEmergencySmsMode();
     }