Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId

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

View File

@@ -52,6 +52,7 @@ import com.android.internal.telephony.PhoneConstants;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.network.ApnSettings;
import com.android.settings.network.SubscriptionUtil;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
@@ -126,7 +127,7 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
}
ImsManager.getInstance(mContext,
SubscriptionManager.getPhoneId(mSubId)).factoryReset();
SubscriptionUtil.getPhoneId(mContext, mSubId)).factoryReset();
restoreDefaultApn(mContext);
if (mEraseEsim) {
return RecoverySystem.wipeEuiccData(mContext, mPackageName);