From 0082b161ca42b41925fd5973f1779fc4c46f6034 Mon Sep 17 00:00:00 2001 From: Yueming Wang Date: Fri, 13 Jul 2018 10:29:43 +0000 Subject: Revert "Update SubscriptionInfo o use strings for mccmnc" This reverts commit 0c149bd2d84d6e7c21dd4d7fff1e4dcfd51318f3. Reason for revert: reverting this topic as it breaks several branches. Change-Id: Ia01984242e54b5db5d853135b322ebb1284a4d43 Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c --- api/current.txt | 6 +-- .../statusbar/policy/NetworkControllerImpl.java | 2 +- .../java/android/telephony/SubscriptionInfo.java | 56 ++++++---------------- .../android/telephony/SubscriptionManager.java | 14 ------ 4 files changed, 17 insertions(+), 61 deletions(-) diff --git a/api/current.txt b/api/current.txt index 9d6b6895e750..1ae46d5d8a0e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -40774,10 +40774,8 @@ package android.telephony { method public java.lang.CharSequence getDisplayName(); method public java.lang.String getIccId(); method public int getIconTint(); - method public deprecated int getMcc(); - method public java.lang.String getMccString(); - method public deprecated int getMnc(); - method public java.lang.String getMncString(); + method public int getMcc(); + method public int getMnc(); method public java.lang.String getNumber(); method public int getSimSlotIndex(); method public int getSubscriptionId(); 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..d45a5ec70782 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, 0, 0, ""); 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..936505ca407d 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -33,9 +33,9 @@ import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.DisplayMetrics; -import android.util.Log; import java.util.Arrays; +import java.util.ArrayList; import java.util.List; /** @@ -105,12 +105,12 @@ public class SubscriptionInfo implements Parcelable { /** * Mobile Country Code */ - private String mMcc; + private int mMcc; /** * Mobile Network Code */ - private String mMnc; + private int mMnc; /** * ISO Country code for the subscription's provider @@ -138,11 +138,11 @@ public class SubscriptionInfo implements Parcelable { * @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) { + CharSequence carrierName, int nameSource, int iconTint, String number, int roaming, + Bitmap icon, int mcc, int mnc, String countryIso) { this(id, iccId, simSlotIndex, displayName, carrierName, nameSource, iconTint, number, - roaming, icon, mcc, mnc, countryIso, false /* isEmbedded */, - null /* accessRules */, null /* accessRules */); + roaming, icon, mcc, mnc, countryIso, false /* isEmbedded */, + null /* accessRules */, null /* accessRules */); } /** @@ -150,7 +150,7 @@ public class SubscriptionInfo implements Parcelable { */ 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, + Bitmap icon, int mcc, int 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 */); @@ -161,7 +161,7 @@ public class SubscriptionInfo implements Parcelable { */ 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, + Bitmap icon, int mcc, int mnc, String countryIso, boolean isEmbedded, @Nullable UiccAccessRule[] accessRules, String cardId) { this.mId = id; this.mIccId = iccId; @@ -316,43 +316,15 @@ public class SubscriptionInfo implements Parcelable { /** * @return the MCC. - * @deprecated Use {@link #getMccString()} instead. */ - @Deprecated public int getMcc() { - try { - return this.mMcc == null ? 0 : Integer.valueOf(this.mMcc); - } catch (NumberFormatException e) { - Log.w(SubscriptionInfo.class.getSimpleName(), "MCC string is not a number"); - return 0; - } + return this.mMcc; } /** * @return the MNC. - * @deprecated Use {@link #getMncString()} instead. */ - @Deprecated public int getMnc() { - try { - return this.mMnc == null ? 0 : Integer.valueOf(this.mMnc); - } catch (NumberFormatException e) { - Log.w(SubscriptionInfo.class.getSimpleName(), "MNC string is not a number"); - return 0; - } - } - - /** - * @return The MCC, as a string. - */ - public String getMccString() { - return this.mMcc; - } - - /** - * @return The MNC, as a string. - */ - public String getMncString() { return this.mMnc; } @@ -453,8 +425,8 @@ public class SubscriptionInfo implements Parcelable { int iconTint = source.readInt(); String number = source.readString(); int dataRoaming = source.readInt(); - String mcc = source.readString(); - String mnc = source.readString(); + int mcc = source.readInt(); + int mnc = source.readInt(); String countryIso = source.readString(); Bitmap iconBitmap = Bitmap.CREATOR.createFromParcel(source); boolean isEmbedded = source.readBoolean(); @@ -483,8 +455,8 @@ public class SubscriptionInfo implements Parcelable { dest.writeInt(mIconTint); dest.writeString(mNumber); dest.writeInt(mDataRoaming); - dest.writeString(mMcc); - dest.writeString(mMnc); + dest.writeInt(mMcc); + dest.writeInt(mMnc); dest.writeString(mCountryIso); mIconBitmap.writeToParcel(dest, flags); dest.writeBoolean(mIsEmbedded); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 310d2bf2083b..5a60aa669d80 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -242,20 +242,6 @@ public class SubscriptionManager { /** @hide */ public static final int SIM_PROVISIONED = 0; - /** - * TelephonyProvider column name for the MCC associated with a SIM, stored as a string. - *

Type: TEXT (String)

- * @hide - */ - public static final String MCC_STRING = "mcc_string"; - - /** - * TelephonyProvider column name for the MNC associated with a SIM, stored as a string. - *

Type: TEXT (String)

- * @hide - */ - public static final String MNC_STRING = "mnc_string"; - /** * TelephonyProvider column name for the MCC associated with a SIM. *

Type: INTEGER (int)

-- cgit v1.2.3-59-g8ed1b