Merge "Merge "Add getEsn()." into nyc-mr1-dev am: 16717be173" into nyc-mr1-dev-plus-aosp (d571dc27) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+33 −0

Original line number	Diff line number	Diff line
		@@ -5214,4 +5214,37 @@ public class TelephonyManager {
		return null;
		}

		/**
		* Return the Electronic Serial Number.
		*
		* Requires that the calling app has READ_PRIVILEGED_PHONE_STATE permission
		*
		* @return ESN or null if error.
		* @hide
		*/
		public String getEsn() {
		return getEsn(getDefaultSubscription());
		}

		/**
		* Return the Electronic Serial Number.
		*
		* Requires that the calling app has READ_PRIVILEGED_PHONE_STATE permission
		*
		* @param subId the subscription ID that this request applies to.
		* @return ESN or null if error.
		* @hide
		*/
		public String getEsn(int subId) {
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		return service.getEsn(subId);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#getEsn", e);
		}
		return null;
		}

		}

+11 −0

Original line number	Diff line number	Diff line
		@@ -1076,4 +1076,15 @@ interface ITelephony {
		* @return Application ID for specificied app type or null if no uicc or error.
		*/
		String getAidForAppType(int subId, int appType);

		/**
		* Return the Electronic Serial Number.
		*
		* Requires that the calling app has READ_PRIVILEGED_PHONE_STATE permission
		*
		* @param subId the subscription ID that this request applies to.
		* @return ESN or null if error.
		* @hide
		*/
		String getEsn(int subId);
		}