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

Merge "[TelephonyMainline] Cannot use UnsupportedAppUsage API, use appropriate method to replace it."

Browse Source
This commit is contained in:
Zoey Chen
2019-12-11 03:10:33 +00:00
committed by Gerrit Code Review
parent be64b53449 a65fe478b9
commit a9ef0e9bb4
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -508,8 +508,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);
@@ -1903,24 +1905,17 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
String setId = null;
int ddSubId = SubscriptionManager.getDefaultDataSubscriptionId();
if (SubscriptionManager.isValidSubscriptionId(ddSubId)) {
phone = phone.createForSubscriptionId(ddSubId);
}
if ((flags & AGPS_RIL_REQUEST_SETID_IMSI) == AGPS_RIL_REQUEST_SETID_IMSI) {
if (SubscriptionManager.isValidSubscriptionId(ddSubId)) {
setId = phone.getSubscriberId(ddSubId);
}
if (setId == null) {
setId = phone.getSubscriberId();
}
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();
}
setId = phone.getLine1Number();
if (setId != null) {
// This means the framework has the SIM card.
type = AGPS_SETID_TYPE_MSISDN;