Merge "Fix isInEmergency bug" into sc-dev

2021-05-25 22:36:58 +00:00
parent c1e65680bf 1f12b2f2c2
commit c719287ead
1 changed files with 4 additions and 1 deletions
--- 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();
    }