Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21c4a584 authored by Wyatt Riley's avatar Wyatt Riley Committed by android-build-merger
Browse files

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

am: 80923168

Change-Id: If2f27dd775d4d5d543d23d10dcce10bc1bc4f51a
parents 94029593 80923168

location/java/com/android/internal/location/GpsNetInitiatedHandler.java

+5 −4
Original line number Diff line number Diff line
@@ -124,8 +124,8 @@ public class GpsNetInitiatedHandler { 
    static private boolean mIsHexInput = true;



    // End time of emergency call, and extension, if set

    private long mCallEndElapsedRealtimeMillis = 0;

    private long mEmergencyExtensionMillis = 0;

    private volatile long mCallEndElapsedRealtimeMillis = 0;

    private volatile long mEmergencyExtensionMillis = 0;



    public static class GpsNiNotification

    {
@@ -248,8 +248,9 @@ public class GpsNetInitiatedHandler { 
     */

    public boolean getInEmergency() {

        boolean isInEmergencyExtension =

                (SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis) <

                        mEmergencyExtensionMillis;

                (mCallEndElapsedRealtimeMillis > 0)

                && ((SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis)

                        < mEmergencyExtensionMillis);

        boolean isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode();

        return mIsInEmergencyCall || isInEmergencyCallback || isInEmergencyExtension;

    }

services/core/java/com/android/server/location/GnssLocationProvider.java

+2 −3
Original line number Diff line number Diff line
@@ -739,12 +739,11 @@ public class GnssLocationProvider implements LocationProviderInterface { 
        // while IO initialization and registration is delegated to our internal handler

        // this approach is just fine because events are posted to our handler anyway

        mProperties = new Properties();

        sendMessage(INITIALIZE_HANDLER, 0, null);



        // Create a GPS net-initiated handler.

        // Create a GPS net-initiated handler (also needed by handleInitialize)

        mNIHandler = new GpsNetInitiatedHandler(context,

                                                mNetInitiatedListener,

                                                mSuplEsEnabled);

        sendMessage(INITIALIZE_HANDLER, 0, null);



        mListenerHelper = new GnssStatusListenerHelper(mHandler) {

            @Override