Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6199d92b authored by Yu-Han Yang's avatar Yu-Han Yang Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703987

Change-Id: I9676ae77089e7f7929ecb2050c7c9f3a3e25aee3
parents 5c0917b4 c719287e

services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java

+4 −1
Original line number Diff line number Diff line
@@ -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();

    }