From fdcf6469f1cfca1aaa17e548cf960f2053e6f2e7 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Thu, 9 Aug 2018 17:01:35 -0700 Subject: Remove old SubscriptionInfo constructors. Bug: 92796390 Test: build Change-Id: Id5ce174b43934e690f6c1682e502b3b7e344a865 Merged-In: Id5ce174b43934e690f6c1682e502b3b7e344a865 --- .../statusbar/policy/NetworkControllerImpl.java | 2 +- .../java/android/telephony/SubscriptionInfo.java | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 9ca8284280ac..551469851d19 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -930,7 +930,7 @@ public class NetworkControllerImpl extends BroadcastReceiver private SubscriptionInfo addSignalController(int id, int simSlotIndex) { SubscriptionInfo info = new SubscriptionInfo(id, "", simSlotIndex, "", "", 0, 0, "", 0, - null, null, null, ""); + null, null, null, "", false, null, null); MobileSignalController controller = new MobileSignalController(mContext, mConfig, mHasMobileDataFeature, mPhone, mCallbackHandler, this, info, mSubDefaults, mReceiverHandler.getLooper()); diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index d76e39b83801..667ad91086b2 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -134,28 +134,6 @@ public class SubscriptionInfo implements Parcelable { */ private String mCardId; - /** - * @hide - */ - public SubscriptionInfo(int id, String iccId, int simSlotIndex, CharSequence displayName, - CharSequence carrierName, int nameSource, int iconTint, String number, int roaming, - Bitmap icon, String mcc, String mnc, String countryIso) { - this(id, iccId, simSlotIndex, displayName, carrierName, nameSource, iconTint, number, - roaming, icon, mcc, mnc, countryIso, false /* isEmbedded */, - null /* accessRules */, null /* accessRules */); - } - - /** - * @hide - */ - public SubscriptionInfo(int id, String iccId, int simSlotIndex, CharSequence displayName, - CharSequence carrierName, int nameSource, int iconTint, String number, int roaming, - Bitmap icon, String mcc, String mnc, String countryIso, boolean isEmbedded, - @Nullable UiccAccessRule[] accessRules) { - this(id, iccId, simSlotIndex, displayName, carrierName, nameSource, iconTint, number, - roaming, icon, mcc, mnc, countryIso, isEmbedded, accessRules, null /* cardId */); - } - /** * @hide */ -- cgit v1.2.3-59-g8ed1b