diff options
author | Shishir Agrawal <shishir@google.com> | 2014-12-01 20:17:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-01 20:17:26 +0000 |
commit | 089f95f4483c95873cf0084c11cb23a0f5b32c3c (patch) | |
tree | d11a6c1055994c178fa23cd72051276f84d654de | |
parent | 659de832b9796e14de44b6411980a65e33283a93 (diff) | |
parent | 0201a6f6f16a872405a5f9ee65026e948eb162d0 (diff) | |
download | frameworks_base-089f95f4483c95873cf0084c11cb23a0f5b32c3c.zip frameworks_base-089f95f4483c95873cf0084c11cb23a0f5b32c3c.tar.gz frameworks_base-089f95f4483c95873cf0084c11cb23a0f5b32c3c.tar.bz2 |
Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
-rw-r--r-- | api/current.txt | 2 | ||||
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 11 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 707ddab..d139136 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28721,7 +28721,7 @@ package android.telephony { method public void listen(android.telephony.PhoneStateListener, int); method public java.lang.String sendEnvelopeWithStatus(java.lang.String); method public boolean setGlobalPreferredNetworkType(); - method public void setLine1NumberForDisplay(java.lang.String, java.lang.String); + method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String); method public boolean setOperatorBrandOverride(java.lang.String); method public boolean setVoiceMailNumber(java.lang.String, java.lang.String); field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE"; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 1b54eec..53f1945 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1811,9 +1811,10 @@ public class TelephonyManager { * * @param alphaTag alpha-tagging of the dailing nubmer * @param number The dialing number + * @return true if the operation was executed correctly. */ - public void setLine1NumberForDisplay(String alphaTag, String number) { - setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number); + public boolean setLine1NumberForDisplay(String alphaTag, String number) { + return setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number); } /** @@ -1828,14 +1829,16 @@ public class TelephonyManager { * @param subId the subscriber that the alphatag and dialing number belongs to. * @param alphaTag alpha-tagging of the dailing nubmer * @param number The dialing number + * @return true if the operation was executed correctly. * @hide */ - public void setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) { + public boolean setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) { try { - getITelephony().setLine1NumberForDisplayForSubscriber(subId, alphaTag, number); + return getITelephony().setLine1NumberForDisplayForSubscriber(subId, alphaTag, number); } catch (RemoteException ex) { } catch (NullPointerException ex) { } + return false; } /** diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index adb3bc4..0a50d54 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -740,8 +740,9 @@ interface ITelephony { * @param subId the subscriber that the alphatag and dialing number belongs to. * @param alphaTag alpha-tagging of the dailing nubmer * @param number The dialing number + * @return true if the operation was executed correctly. */ - void setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number); + boolean setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number); /** * Returns the displayed dialing number string if it was set previously via |