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

Commit 6651da75 authored Apr 02, 2013 by Robert Greenwalt Committed by Android (Google) Code Review Apr 02, 2013

Merge "make new API to retrieve group identifier level1" into jb-mr2-dev

parents 4750c8c1 0e4abef0

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1318,6 +1318,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
		@@ -230,6 +230,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;