diff options
author | Shishir Agrawal <shishir@google.com> | 2014-09-05 23:51:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 23:51:40 +0000 |
commit | 1244333998c5be80b5abe34bbf38922cb4366b57 (patch) | |
tree | dfab1d2c9ede079d19556d4931efc2579519b5a2 /telephony | |
parent | f7c8b58e847825633d1e110dde058026b221598f (diff) | |
parent | d2cfa92146ecfa5e00d4a3ce8e63b1a588845fe2 (diff) | |
download | frameworks_base-1244333998c5be80b5abe34bbf38922cb4366b57.zip frameworks_base-1244333998c5be80b5abe34bbf38922cb4366b57.tar.gz frameworks_base-1244333998c5be80b5abe34bbf38922cb4366b57.tar.bz2 |
Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 10 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 7 |
2 files changed, 7 insertions, 10 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index cdee3de..0078ea8 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3023,9 +3023,9 @@ public class TelephonyManager { } /** - * Override the branding for the input ICCID. + * Override the branding for the current ICCID. * - * Once set, whenever the ICCID is inserted into the device, the service + * Once set, whenever the SIM is present in the device, the service * provider name (SPN) and the operator name will both be replaced by the * brand value input. To unset the value, the same function should be * called with a null brand value. @@ -3034,14 +3034,12 @@ public class TelephonyManager { * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} * or has to be carrier app - see #hasCarrierPrivileges. * - * @param iccId The ICCID of that the branding applies to. * @param brand The brand name to display/set. * @return true if the operation was executed correctly. */ - public boolean setOperatorBrandOverride(String iccId, String brand) { - // TODO: Validate ICCID format. + public boolean setOperatorBrandOverride(String brand) { try { - return getITelephony().setOperatorBrandOverride(iccId, brand); + return getITelephony().setOperatorBrandOverride(brand); } catch (RemoteException ex) { Rlog.e(TAG, "setOperatorBrandOverride RemoteException", ex); } catch (NullPointerException ex) { diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 5c3dcdb..f587d72 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -766,9 +766,9 @@ interface ITelephony { String getLine1AlphaTagForDisplay(long subId); /** - * Override the operator branding for the input ICCID. + * Override the operator branding for the current ICCID. * - * Once set, whenever the ICCID is inserted into the device, the service + * Once set, whenever the SIM is present in the device, the service * provider name (SPN) and the operator name will both be replaced by the * brand value input. To unset the value, the same function should be * called with a null brand value. @@ -777,11 +777,10 @@ interface ITelephony { * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} * or has to be carrier app - see #hasCarrierPrivileges. * - * @param iccid The ICCID of that the branding applies to. * @param brand The brand name to display/set. * @return true if the operation was executed correctly. */ - boolean setOperatorBrandOverride(String iccId, String brand); + boolean setOperatorBrandOverride(String brand); /** * Returns the result and response from RIL for oem request |