Merge "Flag using active SIM in onRequestSetId"

This commit is contained in:
Yu-Han Yang
2022-09-27 16:25:44 +00:00
committed by Android (Google) Code Review

View File

@@ -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)) {