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

Commit d5d198f9 authored by Yu-Han Yang's avatar Yu-Han Yang Committed by Android (Google) Code Review
Browse files

Merge "Flag using active SIM in onRequestSetId"

parents 94fa91d0 ea942ef3

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

+2 −1
Original line number Diff line number Diff line
@@ -1722,7 +1722,8 @@ public class GnssLocationProvider extends AbstractLocationProvider implements 
        String setId = null;



        int subId = SubscriptionManager.getDefaultDataSubscriptionId();

        if (mNIHandler.getInEmergency() && mNetworkConnectivityHandler.getActiveSubId() >= 0) {

        if (mGnssConfiguration.isActiveSimEmergencySuplEnabled() && mNIHandler.getInEmergency()

                && mNetworkConnectivityHandler.getActiveSubId() >= 0) {

            subId = mNetworkConnectivityHandler.getActiveSubId();

        }

        if (SubscriptionManager.isValidSubscriptionId(subId)) {