Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e4abef0 authored Mar 21, 2013 by Sungmin Choi Committed by Robert Greenwalt Mar 27, 2013

make new API to retrieve group identifier level1

For mvno, user can add or edit mvno data field. To pre-provide
the mvno data of the edited apn when the user selects one of
the mvno types, need to support IMSI, SPN, and GID1 data.
To support GID1, make API to retrieve group identifier level1.

bug:6445254
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb

parent 6ca911a9

src/java/com/android/internal/telephony/Phone.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1316,6 +1316,11 @@ public interface Phone {
		*/
		String getSubscriberId();

		/**
		* Retrieves the Group Identifier Level1 for GSM phones.
		*/
		String getGroupIdLevel1();

		/**
		* Retrieves the serial number of the ICC, if applicable.
		*/

src/java/com/android/internal/telephony/PhoneProxy.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -901,6 +901,11 @@ public class PhoneProxy extends Handler implements Phone {
		return mActivePhone.getSubscriberId();
		}

		@Override
		public String getGroupIdLevel1() {
		return mActivePhone.getGroupIdLevel1();
		}

		@Override
		public String getIccSerialNumber() {
		return mActivePhone.getIccSerialNumber();

src/java/com/android/internal/telephony/PhoneSubInfo.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,14 @@ public class PhoneSubInfo extends IPhoneSubInfo.Stub {
		return mPhone.getSubscriberId();
		}

		/**
		* Retrieves the Group Identifier Level1 for GSM phones.
		*/
		public String getGroupIdLevel1() {
		mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, "Requires READ_PHONE_STATE");
		return mPhone.getGroupIdLevel1();
		}

		/**
		* Retrieves the serial number of the ICC, if applicable.
		*/

src/java/com/android/internal/telephony/PhoneSubInfoProxy.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,13 @@ public class PhoneSubInfoProxy extends IPhoneSubInfo.Stub {
		return mPhoneSubInfo.getSubscriberId();
		}

		/**
		* Retrieves the Group Identifier Level1 for GSM phones.
		*/
		public String getGroupIdLevel1() {
		return mPhoneSubInfo.getGroupIdLevel1();
		}

		/**
		* Retrieves the serial number of the ICC, if applicable.
		*/

src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,12 @@ public class CDMALTEPhone extends CDMAPhone {
		return (mSimRecords != null) ? mSimRecords.getIMSI() : "";
		}

		// return GID1 from USIM
		@Override
		public String getGroupIdLevel1() {
		return (mSimRecords != null) ? mSimRecords.getGid1() : "";
		}

		@Override
		public String getImei() {
		return mImei;