Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix isInEmergency bug" into sc-dev

Browse Source
This commit is contained in:
Yu-Han Yang
2021-05-25 22:36:58 +00:00
committed by Android (Google) Code Review
parent c1e65680bf 1f12b2f2c2
commit c719287ead
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java
View File

@@ -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();
} }