Merge "Fix isInEmergency bug" into sc-dev am: c719287ead

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703987 Change-Id: I41cbcdd601a1600fa64b658fab72dd6cc768580a
2021-05-25 22:59:59 +00:00
parent 9bca2cfa6a c719287ead
commit 4302d9d309
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();
    }