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

Commit c719287e authored by Yu-Han Yang's avatar Yu-Han Yang Committed by Android (Google) Code Review
Browse files

Merge "Fix isInEmergency bug" into sc-dev

parents c1e65680 1f12b2f2

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -72,8 +72,11 @@ public class SystemEmergencyHelper extends EmergencyHelper { 




    @Override

    @Override

    public boolean isInEmergency(long extensionTimeMs) {

    public boolean isInEmergency(long extensionTimeMs) {

        boolean isInExtensionTime = mEmergencyCallEndRealtimeMs != Long.MIN_VALUE

                && (SystemClock.elapsedRealtime() - mEmergencyCallEndRealtimeMs) < extensionTimeMs;



        return mIsInEmergencyCall

        return mIsInEmergencyCall

                || ((SystemClock.elapsedRealtime() - mEmergencyCallEndRealtimeMs) < extensionTimeMs)

                || isInExtensionTime

                || mTelephonyManager.getEmergencyCallbackMode()

                || mTelephonyManager.getEmergencyCallbackMode()

                || mTelephonyManager.isInEmergencySmsMode();

                || mTelephonyManager.isInEmergencySmsMode();

    }

    }