PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId

Browse Source 
Bug: 140908357
Test: build
Change-Id: Idaa206c7659717a269738c0121a31d957f7d90d0
This commit is contained in:
Malcolm Chen
2019-12-12 16:23:33 -08:00
parent d8c711d891
commit 26e5dbdbfd
9 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/ApnSettings.java
View File

@@ -152,9 +152,9 @@ public class ApnSettings extends RestrictedSettingsFragment
if (!mRestoreDefaultApnMode) {
int extraSubId = intent.getIntExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
if (SubscriptionManager.isValidSubscriptionId(extraSubId) &&
mPhoneId == SubscriptionManager.getPhoneId(extraSubId) &&
extraSubId != mSubId) {
if (SubscriptionManager.isValidSubscriptionId(extraSubId)
&& mPhoneId == SubscriptionUtil.getPhoneId(context, extraSubId)
&& extraSubId != mSubId) {
// subscription has changed
mSubId = extraSubId;
mSubscriptionInfo = getSubscriptionInfo(mSubId);
@@ -185,7 +185,7 @@ public class ApnSettings extends RestrictedSettingsFragment
final Activity activity = getActivity();
mSubId = activity.getIntent().getIntExtra(SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mPhoneId = SubscriptionManager.getPhoneId(mSubId);
mPhoneId = SubscriptionUtil.getPhoneId(activity, mSubId);
mIntentFilter = new IntentFilter(
TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
mIntentFilter.addAction(TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED);