diff options
author | Junda Liu <junda@google.com> | 2014-08-21 04:43:37 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-21 04:43:39 +0000 |
commit | cad78a801d7cf8635928cb77febbf4c2d185d668 (patch) | |
tree | fb5137812753547f2021c29fe081c7b6d9219269 /telephony | |
parent | 7cb10ac3928c1c298768f9a0dbeb2e5906527b68 (diff) | |
parent | 2b2469b07d6ea9410bdb8d1234aa2320b02bdaa9 (diff) | |
download | frameworks_base-cad78a801d7cf8635928cb77febbf4c2d185d668.zip frameworks_base-cad78a801d7cf8635928cb77febbf4c2d185d668.tar.gz frameworks_base-cad78a801d7cf8635928cb77febbf4c2d185d668.tar.bz2 |
Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 36 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 12 |
2 files changed, 48 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0eb170c..71b796a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3056,6 +3056,42 @@ public class TelephonyManager { /** @hide */ @SystemApi + public String getCdmaMdn() { + return getCdmaMdn(getDefaultSubscription()); + } + + /** @hide */ + @SystemApi + public String getCdmaMdn(long subId) { + try { + return getITelephony().getCdmaMdn(subId); + } catch (RemoteException ex) { + return null; + } catch (NullPointerException ex) { + return null; + } + } + + /** @hide */ + @SystemApi + public String getCdmaMin() { + return getCdmaMin(getDefaultSubscription()); + } + + /** @hide */ + @SystemApi + public String getCdmaMin(long subId) { + try { + return getITelephony().getCdmaMin(subId); + } catch (RemoteException ex) { + return null; + } catch (NullPointerException ex) { + return null; + } + } + + /** @hide */ + @SystemApi public int checkCarrierPrivilegesForPackage(String pkgname) { try { return getITelephony().checkCarrierPrivilegesForPackage(pkgname); diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index d256f9d..22c09f0 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -677,6 +677,18 @@ interface ITelephony { void setImsRegistrationState(boolean registered); /** + * Return MDN string for CDMA phone. + * @param subId user preferred subId. + */ + String getCdmaMdn(long subId); + + /** + * Return MIN string for CDMA phone. + * @param subId user preferred subId. + */ + String getCdmaMin(long subId); + + /** * Has the calling application been granted special privileges by the carrier. * * If any of the packages in the calling UID has carrier privileges, the |