summaryrefslogtreecommitdiff
path: root/location/java/com
diff options
context:
space:
mode:
author Brad Ebinger <breadley@google.com> 2019-03-15 13:50:34 -0700
committer Brad Ebinger <breadley@google.com> 2019-03-20 11:11:10 -0700
commit5eeb79d4b5975f93f6aaccc77dfc00b42d243701 (patch)
treea72f092b8ffb880f58400d9ff9468b4c935aa7bd /location/java/com
parent05a8e0b44cdfa466ff1c4dce36b7c08cfb178238 (diff)
Query isEmergencySmsMode API when checking if emergency for GPS
When location SUPL request comes in for GPS NI handler, also check emergency SMS mode in telephony, which is true for a carrier defined amount of time after an emergency SMS is sent. Bug: 126091115 Test: manual - send fake emergency sms, check api is true. Change-Id: I34d26d2940af5b0c412e20ce3668344da8656339
Diffstat (limited to 'location/java/com')
-rw-r--r--location/java/com/android/internal/location/GpsNetInitiatedHandler.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
index b5313256e4dc..4c8d04549bed 100644
--- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
+++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
@@ -241,6 +241,8 @@ public class GpsNetInitiatedHandler {
* window after the end of that call.
* 3. If the device is in a emergency callback state, this is provided by querying
* TelephonyManager.
+ * 4. If the user has recently sent an Emergency SMS and telephony reports that it is in
+ * emergency SMS mode, this is provided by querying TelephonyManager.
* @return true if is considered in user initiated emergency mode for NI purposes
*/
public boolean getInEmergency() {
@@ -248,7 +250,9 @@ public class GpsNetInitiatedHandler {
(SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis) <
mEmergencyExtensionMillis;
boolean isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode();
- return mIsInEmergencyCall || isInEmergencyCallback || isInEmergencyExtension;
+ boolean isInEmergencySmsMode = mTelephonyManager.isInEmergencySmsMode();
+ return mIsInEmergencyCall || isInEmergencyCallback || isInEmergencyExtension
+ || isInEmergencySmsMode;
}
public void setEmergencyExtensionSeconds(int emergencyExtensionSeconds) {