summaryrefslogtreecommitdiff
path: root/location/java/com
diff options
context:
space:
mode:
author Yu-Han Yang <yuhany@google.com> 2020-02-27 14:27:02 -0800
committer Yu-Han Yang <yuhany@google.com> 2020-02-27 14:31:42 -0800
commit5ca36f4012b89949ae0e3152f553bc4c853800a9 (patch)
treebade0bc12d71f7c70835a1147adb4d6f857e4240 /location/java/com
parente97e0c8e731d27fea6b337bc5815c74c4f7678e6 (diff)
Log permission mismatch with 128s emergency extension
Bug: 145793324 Test: on device Change-Id: Iea685e407aebe1fb77bb57c9df9f8034f9641d58
Diffstat (limited to 'location/java/com')
-rw-r--r--location/java/com/android/internal/location/GpsNetInitiatedHandler.java17
1 files changed, 15 insertions, 2 deletions
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