Merge "Remove old SubscriptionInfo constructors." am: 03fcb263ab (9e07ab76) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -976,7 +976,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());

+0 −22

Original line number	Diff line number	Diff line
		@@ -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
		*/