Merge "Type Allocation Code & Manufacturer Code" (ff801e5f) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -40832,9 +40832,13 @@ package android.telephony {
		method public java.lang.String getIccAuthentication(int, int, java.lang.String);
		method public java.lang.String getImei();
		method public java.lang.String getImei(int);
		method public java.lang.String getTypeAllocationCode();
		method public java.lang.String getTypeAllocationCode(int);
		method public java.lang.String getLine1Number();
		method public java.lang.String getMeid();
		method public java.lang.String getMeid(int);
		method public java.lang.String getManufacturerCode();
		method public java.lang.String getManufacturerCode(int);
		method public java.lang.String getMmsUAProfUrl();
		method public java.lang.String getMmsUserAgent();
		method public java.lang.String getNai();

telephony/java/android/telephony/TelephonyManager.java

+54 −0

Original line number	Diff line number	Diff line
		@@ -1229,6 +1229,33 @@ public class TelephonyManager {
		}
		}

		/**
		* Returns the Type Allocation Code from the IMEI. Return null if Type Allocation Code is not
		* available.
		*/
		public String getTypeAllocationCode() {
		return getTypeAllocationCode(getSlotIndex());
		}

		/**
		* Returns the Type Allocation Code from the IMEI. Return null if Type Allocation Code is not
		* available.
		*
		* @param slotIndex of which Type Allocation Code is returned
		*/
		public String getTypeAllocationCode(int slotIndex) {
		ITelephony telephony = getITelephony();
		if (telephony == null) return null;

		try {
		return telephony.getTypeAllocationCodeForSlot(slotIndex);
		} catch (RemoteException ex) {
		return null;
		} catch (NullPointerException ex) {
		return null;
		}
		}

		/**
		* Returns the MEID (Mobile Equipment Identifier). Return null if MEID is not available.
		*
		@@ -1264,6 +1291,33 @@ public class TelephonyManager {
		}
		}

		/**
		* Returns the Manufacturer Code from the MEID. Return null if Manufacturer Code is not
		* available.
		*/
		public String getManufacturerCode() {
		return getManufacturerCode(getSlotIndex());
		}

		/**
		* Returns the Manufacturer Code from the MEID. Return null if Manufacturer Code is not
		* available.
		*
		* @param slotIndex of which Type Allocation Code is returned
		*/
		public String getManufacturerCode(int slotIndex) {
		ITelephony telephony = getITelephony();
		if (telephony == null) return null;

		try {
		return telephony.getManufacturerCodeForSlot(slotIndex);
		} catch (RemoteException ex) {
		return null;
		} catch (NullPointerException ex) {
		return null;
		}
		}

		/**
		* Returns the Network Access Identifier (NAI). Return null if NAI is not available.
		*

telephony/java/com/android/internal/telephony/ITelephony.aidl

+14 −0

Original line number	Diff line number	Diff line
		@@ -1197,6 +1197,13 @@ interface ITelephony {
		*/
		String getImeiForSlot(int slotIndex, String callingPackage);

		/**
		* Returns the Type Allocation Code from the IMEI for the given slot.
		*
		* @param slotIndex - Which slot to retrieve the Type Allocation Code from.
		*/
		String getTypeAllocationCodeForSlot(int slotIndex);

		/**
		* Returns the MEID for the given slot.
		*
		@@ -1207,6 +1214,13 @@ interface ITelephony {
		*/
		String getMeidForSlot(int slotIndex, String callingPackage);

		/**
		* Returns the Manufacturer Code from the MEID for the given slot.
		*
		* @param slotIndex - Which slot to retrieve the Manufacturer Code from.
		*/
		String getManufacturerCodeForSlot(int slotIndex);

		/**
		* Returns the device software version.
		*