From 5ca36f4012b89949ae0e3152f553bc4c853800a9 Mon Sep 17 00:00:00 2001 From: Yu-Han Yang Date: Thu, 27 Feb 2020 14:27:02 -0800 Subject: Log permission mismatch with 128s emergency extension Bug: 145793324 Test: on device Change-Id: Iea685e407aebe1fb77bb57c9df9f8034f9641d58 --- .../internal/location/GpsNetInitiatedHandler.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'location/java/com') diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java index 9846436b3ac8..d5ae3bc4d881 100644 --- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java +++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java @@ -252,10 +252,23 @@ public class GpsNetInitiatedHandler { * @return true if is considered in user initiated emergency mode for NI purposes */ public boolean getInEmergency() { + return getInEmergency(mEmergencyExtensionMillis); + } + + /** + * Determines whether device is in user-initiated emergency session with the given extension + * time. + * + * @return true if is considered in user initiated emergency mode for NI purposes within the + * given extension time. + * + * @see {@link #getInEmergency()} + */ + public boolean getInEmergency(long emergencyExtensionMillis) { boolean isInEmergencyExtension = (mCallEndElapsedRealtimeMillis > 0) - && ((SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis) - < mEmergencyExtensionMillis); + && ((SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis) + < emergencyExtensionMillis); boolean isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode(); boolean isInEmergencySmsMode = mTelephonyManager.isInEmergencySmsMode(); return mIsInEmergencyCall || isInEmergencyCallback || isInEmergencyExtension -- cgit v1.2.3-59-g8ed1b