Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev

Browse Source 
* commit '089f95f4483c95873cf0084c11cb23a0f5b32c3c':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
This commit is contained in:
Shishir Agrawal
2014-12-01 20:22:36 +00:00
committed by Android Git Automerger
parent 1fd78e9268 089f95f448
commit 592707c525
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -28721,7 +28721,7 @@ package android.telephony {
method public void listen(android.telephony.PhoneStateListener, int); method public void listen(android.telephony.PhoneStateListener, int);
method public java.lang.String sendEnvelopeWithStatus(java.lang.String); method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
method public boolean setGlobalPreferredNetworkType(); 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 setOperatorBrandOverride(java.lang.String);
method public boolean setVoiceMailNumber(java.lang.String, 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"; field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";

11
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1811,9 +1811,10 @@ public class TelephonyManager {
* *
* @param alphaTag alpha-tagging of the dailing nubmer * @param alphaTag alpha-tagging of the dailing nubmer
* @param number The dialing number * @param number The dialing number
* @return true if the operation was executed correctly.
*/ */
public void setLine1NumberForDisplay(String alphaTag, String number) { public boolean setLine1NumberForDisplay(String alphaTag, String number) {
setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, 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 subId the subscriber that the alphatag and dialing number belongs to.
* @param alphaTag alpha-tagging of the dailing nubmer * @param alphaTag alpha-tagging of the dailing nubmer
* @param number The dialing number * @param number The dialing number
* @return true if the operation was executed correctly.
* @hide * @hide
*/ */
public void setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) { public boolean setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) {
try { try {
getITelephony().setLine1NumberForDisplayForSubscriber(subId, alphaTag, number); return getITelephony().setLine1NumberForDisplayForSubscriber(subId, alphaTag, number);
} catch (RemoteException ex) { } catch (RemoteException ex) {
} catch (NullPointerException ex) { } catch (NullPointerException ex) {
} }
return false;
} }
/** /**

3
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -740,8 +740,9 @@ interface ITelephony {
* @param subId the subscriber that the alphatag and dialing number belongs to. * @param subId the subscriber that the alphatag and dialing number belongs to.
* @param alphaTag alpha-tagging of the dailing nubmer * @param alphaTag alpha-tagging of the dailing nubmer
* @param number The dialing number * @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 * Returns the displayed dialing number string if it was set previously via