Merge "[Mainline] Remove unused UiccController object" am: e29ca94af4 am: 0c7ec95f35 am: b8a6b088b3

Change-Id: I22bf2290015bd45a686437b4460a1da92c96e634
This commit is contained in:
Automerger Merge Worker
2019-12-25 03:29:39 +00:00

View File

@@ -54,7 +54,6 @@ import androidx.preference.PreferenceGroup;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.uicc.UiccController;
import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -114,7 +113,6 @@ public class ApnSettings extends RestrictedSettingsFragment
private SubscriptionInfo mSubscriptionInfo;
private int mSubId;
private int mPhoneId;
private UiccController mUiccController;
private String mMvnoType;
private String mMvnoMatchData;
@@ -193,7 +191,6 @@ public class ApnSettings extends RestrictedSettingsFragment
setIfOnlyAvailableForAdmins(true);
mSubscriptionInfo = getSubscriptionInfo(mSubId);
mUiccController = UiccController.getInstance();
CarrierConfigManager configManager = (CarrierConfigManager)
getSystemService(Context.CARRIER_CONFIG_SERVICE);