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

Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am: 809231680f

Browse Source 
am: 21c4a58435

Change-Id: I3d4e666268ac37f41c6d94e10f5e5e1f2928ef7f
This commit is contained in:
Wyatt Riley
2019-03-04 07:11:25 -08:00
committed by android-build-merger
parent c03d767ee8 21c4a58435
commit 499b803c52
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
location/java/com/android/internal/location/GpsNetInitiatedHandler.java
View File

@@ -124,8 +124,8 @@ public class GpsNetInitiatedHandler {
static private boolean mIsHexInput = true; static private boolean mIsHexInput = true;
// End time of emergency call, and extension, if set // End time of emergency call, and extension, if set
private long mCallEndElapsedRealtimeMillis = 0; private volatile long mCallEndElapsedRealtimeMillis = 0;
private long mEmergencyExtensionMillis = 0; private volatile long mEmergencyExtensionMillis = 0;
public static class GpsNiNotification public static class GpsNiNotification
{ {
@@ -248,8 +248,9 @@ public class GpsNetInitiatedHandler {
*/ */
public boolean getInEmergency() { public boolean getInEmergency() {
boolean isInEmergencyExtension = boolean isInEmergencyExtension =
(SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis) < (mCallEndElapsedRealtimeMillis > 0)
mEmergencyExtensionMillis; && ((SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis)
< mEmergencyExtensionMillis);
boolean isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode(); boolean isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode();
return mIsInEmergencyCall || isInEmergencyCallback || isInEmergencyExtension; return mIsInEmergencyCall || isInEmergencyCallback || isInEmergencyExtension;
} }

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

@@ -740,12 +740,11 @@ public class GnssLocationProvider implements LocationProviderInterface {
// while IO initialization and registration is delegated to our internal handler // while IO initialization and registration is delegated to our internal handler
// this approach is just fine because events are posted to our handler anyway // this approach is just fine because events are posted to our handler anyway
mProperties = new Properties(); mProperties = new Properties();
sendMessage(INITIALIZE_HANDLER, 0, null); // Create a GPS net-initiated handler (also needed by handleInitialize)
// Create a GPS net-initiated handler.
mNIHandler = new GpsNetInitiatedHandler(context, mNIHandler = new GpsNetInitiatedHandler(context,
mNetInitiatedListener, mNetInitiatedListener,
mSuplEsEnabled); mSuplEsEnabled);
sendMessage(INITIALIZE_HANDLER, 0, null);
mListenerHelper = new GnssStatusListenerHelper(mHandler) { mListenerHelper = new GnssStatusListenerHelper(mHandler) {
@Override @Override