Merge "[TelephonyMainline] Cannot use UnsupportedAppUsage API, use appropriate... (8aba2bbb) · Commits · e / os / android_frameworks_base

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

+9 −14

Original line number	Diff line number	Diff line
		@@ -537,8 +537,10 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		CarrierConfigManager configManager = (CarrierConfigManager)
		mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);
		int ddSubId = SubscriptionManager.getDefaultDataSubscriptionId();
		String mccMnc = SubscriptionManager.isValidSubscriptionId(ddSubId)
		? phone.getSimOperator(ddSubId) : phone.getSimOperator();
		if (SubscriptionManager.isValidSubscriptionId(ddSubId)) {
		phone = phone.createForSubscriptionId(ddSubId);
		}
		String mccMnc = phone.getSimOperator();
		boolean isKeepLppProfile = false;
		if (!TextUtils.isEmpty(mccMnc)) {
		if (DEBUG) Log.d(TAG, "SIM MCC/MNC is available: " + mccMnc);
		@@ -1931,24 +1933,17 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		String setId = null;

		int ddSubId = SubscriptionManager.getDefaultDataSubscriptionId();
		if ((flags & AGPS_RIL_REQUEST_SETID_IMSI) == AGPS_RIL_REQUEST_SETID_IMSI) {
		if (SubscriptionManager.isValidSubscriptionId(ddSubId)) {
		setId = phone.getSubscriberId(ddSubId);
		phone = phone.createForSubscriptionId(ddSubId);
		}
		if (setId == null) {
		if ((flags & AGPS_RIL_REQUEST_SETID_IMSI) == AGPS_RIL_REQUEST_SETID_IMSI) {
		setId = phone.getSubscriberId();
		}
		if (setId != null) {
		// This means the framework has the SIM card.
		type = AGPS_SETID_TYPE_IMSI;
		}
		} else if ((flags & AGPS_RIL_REQUEST_SETID_MSISDN) == AGPS_RIL_REQUEST_SETID_MSISDN) {
		if (SubscriptionManager.isValidSubscriptionId(ddSubId)) {
		setId = phone.getLine1Number(ddSubId);
		}
		if (setId == null) {
		setId = phone.getLine1Number();
		}
		if (setId != null) {
		// This means the framework has the SIM card.
		type = AGPS_SETID_TYPE_MSISDN;