From bc0272754df7a2fb71bf709a2a8a7c852ee69e5c Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Mon, 8 Sep 2014 14:50:58 -0700 Subject: Change suffix UsingSubId to ForSubscriber. Bug: 17255752 Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4 --- .../android/telephony/SubscriptionManager.java | 12 +++--- .../java/android/telephony/TelephonyManager.java | 48 ++++++++++----------- .../android/internal/telephony/IPhoneSubInfo.aidl | 22 +++++----- .../java/com/android/internal/telephony/ISms.aidl | 28 ++++++------ .../java/com/android/internal/telephony/ISub.aidl | 2 +- .../com/android/internal/telephony/ITelephony.aidl | 50 +++++++++++----------- .../internal/telephony/ITelephonyRegistry.aidl | 22 +++++----- 7 files changed, 92 insertions(+), 92 deletions(-) (limited to 'telephony') diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 58d30f1..d0f355e 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -265,9 +265,9 @@ public class SubscriptionManager implements BaseColumns { * @return SubInfoRecord, maybe null * @hide - to be unhidden */ - public static SubInfoRecord getSubInfoUsingSubId(long subId) { + public static SubInfoRecord getSubInfoForSubscriber(long subId) { if (!isValidSubId(subId)) { - logd("[getSubInfoUsingSubIdx]- invalid subId"); + logd("[getSubInfoForSubscriberx]- invalid subId"); return null; } @@ -276,7 +276,7 @@ public class SubscriptionManager implements BaseColumns { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - subInfo = iSub.getSubInfoUsingSubId(subId); + subInfo = iSub.getSubInfoForSubscriber(subId); } } catch (RemoteException ex) { // ignore it @@ -783,7 +783,7 @@ public class SubscriptionManager implements BaseColumns { /** @hide */ public static SubInfoRecord getDefaultVoiceSubInfo() { - return getSubInfoUsingSubId(getDefaultVoiceSubId()); + return getSubInfoForSubscriber(getDefaultVoiceSubId()); } /** @hide */ @@ -826,7 +826,7 @@ public class SubscriptionManager implements BaseColumns { /** @hide */ public static SubInfoRecord getDefaultSmsSubInfo() { - return getSubInfoUsingSubId(getDefaultSmsSubId()); + return getSubInfoForSubscriber(getDefaultSmsSubId()); } /** @hide */ @@ -866,7 +866,7 @@ public class SubscriptionManager implements BaseColumns { /** @hide */ public static SubInfoRecord getDefaultDataSubInfo() { - return getSubInfoUsingSubId(getDefaultDataSubId()); + return getSubInfoForSubscriber(getDefaultDataSubId()); } /** @hide */ diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 38b61ae..164fc3c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -608,7 +608,7 @@ public class TelephonyManager { public String getDeviceId(int slotId) { long[] subId = SubscriptionManager.getSubId(slotId); try { - return getSubscriberInfo().getDeviceIdUsingSubId(subId[0]); + return getSubscriberInfo().getDeviceIdForSubscriber(subId[0]); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -639,7 +639,7 @@ public class TelephonyManager { public String getImei(int slotId) { long[] subId = SubscriptionManager.getSubId(slotId); try { - return getSubscriberInfo().getImeiUsingSubId(subId[0]); + return getSubscriberInfo().getImeiForSubscriber(subId[0]); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -703,7 +703,7 @@ public class TelephonyManager { /** @hide */ public void enableLocationUpdates(long subId) { try { - getITelephony().enableLocationUpdatesUsingSubId(subId); + getITelephony().enableLocationUpdatesForSubscriber(subId); } catch (RemoteException ex) { } catch (NullPointerException ex) { } @@ -725,7 +725,7 @@ public class TelephonyManager { /** @hide */ public void disableLocationUpdates(long subId) { try { - getITelephony().disableLocationUpdatesUsingSubId(subId); + getITelephony().disableLocationUpdatesForSubscriber(subId); } catch (RemoteException ex) { } catch (NullPointerException ex) { } @@ -793,7 +793,7 @@ public class TelephonyManager { try{ ITelephony telephony = getITelephony(); if (telephony != null) { - return telephony.getActivePhoneTypeUsingSubId(subId); + return telephony.getActivePhoneTypeForSubscriber(subId); } else { // This can happen when the ITelephony interface is not up yet. return getPhoneTypeFromProperty(subId); @@ -1159,7 +1159,7 @@ public class TelephonyManager { try { ITelephony telephony = getITelephony(); if (telephony != null) { - return telephony.getNetworkTypeUsingSubId(subId); + return telephony.getNetworkTypeForSubscriber(subId); } else { // This can happen when the ITelephony interface is not up yet. return NETWORK_TYPE_UNKNOWN; @@ -1213,7 +1213,7 @@ public class TelephonyManager { try{ ITelephony telephony = getITelephony(); if (telephony != null) { - return telephony.getDataNetworkTypeUsingSubId(subId); + return telephony.getDataNetworkTypeForSubscriber(subId); } else { // This can happen when the ITelephony interface is not up yet. return NETWORK_TYPE_UNKNOWN; @@ -1245,7 +1245,7 @@ public class TelephonyManager { try{ ITelephony telephony = getITelephony(); if (telephony != null) { - return telephony.getVoiceNetworkTypeUsingSubId(subId); + return telephony.getVoiceNetworkTypeForSubscriber(subId); } else { // This can happen when the ITelephony interface is not up yet. return NETWORK_TYPE_UNKNOWN; @@ -1572,7 +1572,7 @@ public class TelephonyManager { /** {@hide} */ public String getSimSerialNumber(long subId) { try { - return getSubscriberInfo().getIccSerialNumberUsingSubId(subId); + return getSubscriberInfo().getIccSerialNumberForSubscriber(subId); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -1608,7 +1608,7 @@ public class TelephonyManager { /** {@hide} */ public int getLteOnCdmaMode(long subId) { try { - return getITelephony().getLteOnCdmaModeUsingSubId(subId); + return getITelephony().getLteOnCdmaModeForSubscriber(subId); } catch (RemoteException ex) { // Assume no ICC card if remote exception which shouldn't happen return PhoneConstants.LTE_ON_CDMA_UNKNOWN; @@ -1648,7 +1648,7 @@ public class TelephonyManager { /** {@hide} */ public String getSubscriberId(long subId) { try { - return getSubscriberInfo().getSubscriberIdUsingSubId(subId); + return getSubscriberInfo().getSubscriberIdForSubscriber(subId); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -1687,7 +1687,7 @@ public class TelephonyManager { /** {@hide} */ public String getGroupIdLevel1(long subId) { try { - return getSubscriberInfo().getGroupIdLevel1UsingSubId(subId); + return getSubscriberInfo().getGroupIdLevel1ForSubscriber(subId); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -1728,7 +1728,7 @@ public class TelephonyManager { return number; } try { - return getSubscriberInfo().getLine1NumberUsingSubId(subId); + return getSubscriberInfo().getLine1NumberForSubscriber(subId); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -1811,7 +1811,7 @@ public class TelephonyManager { return alphaTag; } try { - return getSubscriberInfo().getLine1AlphaTagUsingSubId(subId); + return getSubscriberInfo().getLine1AlphaTagForSubscriber(subId); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -1845,7 +1845,7 @@ public class TelephonyManager { /** {@hide} */ public String getMsisdn(long subId) { try { - return getSubscriberInfo().getMsisdnUsingSubId(subId); + return getSubscriberInfo().getMsisdnForSubscriber(subId); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -1875,7 +1875,7 @@ public class TelephonyManager { /** {@hide} */ public String getVoiceMailNumber(long subId) { try { - return getSubscriberInfo().getVoiceMailNumberUsingSubId(subId); + return getSubscriberInfo().getVoiceMailNumberForSubscriber(subId); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -1907,7 +1907,7 @@ public class TelephonyManager { /** {@hide} */ public String getCompleteVoiceMailNumber(long subId) { try { - return getSubscriberInfo().getCompleteVoiceMailNumberUsingSubId(subId); + return getSubscriberInfo().getCompleteVoiceMailNumberForSubscriber(subId); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -1937,7 +1937,7 @@ public class TelephonyManager { /** {@hide} */ public int getVoiceMessageCount(long subId) { try { - return getITelephony().getVoiceMessageCountUsingSubId(subId); + return getITelephony().getVoiceMessageCountForSubscriber(subId); } catch (RemoteException ex) { return 0; } catch (NullPointerException ex) { @@ -1969,7 +1969,7 @@ public class TelephonyManager { /** {@hide} */ public String getVoiceMailAlphaTag(long subId) { try { - return getSubscriberInfo().getVoiceMailAlphaTagUsingSubId(subId); + return getSubscriberInfo().getVoiceMailAlphaTagForSubscriber(subId); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { @@ -2059,7 +2059,7 @@ public class TelephonyManager { /** {@hide} */ public int getCallState(long subId) { try { - return getITelephony().getCallStateUsingSubId(subId); + return getITelephony().getCallStateForSubscriber(subId); } catch (RemoteException ex) { // the phone process is restarting. return CALL_STATE_IDLE; @@ -2181,7 +2181,7 @@ public class TelephonyManager { String pkgForDebug = mContext != null ? mContext.getPackageName() : ""; try { Boolean notifyNow = (getITelephony() != null); - sRegistry.listenUsingSubId(listener.mSubId, pkgForDebug, listener.callback, events, notifyNow); + sRegistry.listenForSubscriber(listener.mSubId, pkgForDebug, listener.callback, events, notifyNow); } catch (RemoteException ex) { // system process dead } catch (NullPointerException ex) { @@ -2204,7 +2204,7 @@ public class TelephonyManager { /** {@hide} */ public int getCdmaEriIconIndex(long subId) { try { - return getITelephony().getCdmaEriIconIndexUsingSubId(subId); + return getITelephony().getCdmaEriIconIndexForSubscriber(subId); } catch (RemoteException ex) { // the phone process is restarting. return -1; @@ -2232,7 +2232,7 @@ public class TelephonyManager { /** {@hide} */ public int getCdmaEriIconMode(long subId) { try { - return getITelephony().getCdmaEriIconModeUsingSubId(subId); + return getITelephony().getCdmaEriIconModeForSubscriber(subId); } catch (RemoteException ex) { // the phone process is restarting. return -1; @@ -2257,7 +2257,7 @@ public class TelephonyManager { /** {@hide} */ public String getCdmaEriText(long subId) { try { - return getITelephony().getCdmaEriTextUsingSubId(subId); + return getITelephony().getCdmaEriTextForSubscriber(subId); } catch (RemoteException ex) { // the phone process is restarting. return null; diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl index 552abaf..c203442 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl @@ -31,12 +31,12 @@ interface IPhoneSubInfo { * Retrieves the unique device ID of a subId for the device, e.g., IMEI * for GSM phones. */ - String getDeviceIdUsingSubId(long subId); + String getDeviceIdForSubscriber(long subId); /** * Retrieves the IMEI. */ - String getImeiUsingSubId(long subId); + String getImeiForSubscriber(long subId); /** * Retrieves the software version number for the device, e.g., IMEI/SV @@ -52,7 +52,7 @@ interface IPhoneSubInfo { /** * Retrieves the unique subscriber ID of a given subId, e.g., IMSI for GSM phones. */ - String getSubscriberIdUsingSubId(long subId); + String getSubscriberIdForSubscriber(long subId); /** * Retrieves the Group Identifier Level1 for GSM phones. @@ -62,7 +62,7 @@ interface IPhoneSubInfo { /** * Retrieves the Group Identifier Level1 for GSM phones of a subId. */ - String getGroupIdLevel1UsingSubId(long subId); + String getGroupIdLevel1ForSubscriber(long subId); /** * Retrieves the serial number of the ICC, if applicable. @@ -72,7 +72,7 @@ interface IPhoneSubInfo { /** * Retrieves the serial number of a given subId. */ - String getIccSerialNumberUsingSubId(long subId); + String getIccSerialNumberForSubscriber(long subId); /** * Retrieves the phone number string for line 1. @@ -82,7 +82,7 @@ interface IPhoneSubInfo { /** * Retrieves the phone number string for line 1 of a subcription. */ - String getLine1NumberUsingSubId(long subId); + String getLine1NumberForSubscriber(long subId); /** @@ -93,7 +93,7 @@ interface IPhoneSubInfo { /** * Retrieves the alpha identifier for line 1 of a subId. */ - String getLine1AlphaTagUsingSubId(long subId); + String getLine1AlphaTagForSubscriber(long subId); /** @@ -104,7 +104,7 @@ interface IPhoneSubInfo { /** * Retrieves the Msisdn of a subId. */ - String getMsisdnUsingSubId(long subId); + String getMsisdnForSubscriber(long subId); /** * Retrieves the voice mail number. @@ -114,7 +114,7 @@ interface IPhoneSubInfo { /** * Retrieves the voice mail number of a given subId. */ - String getVoiceMailNumberUsingSubId(long subId); + String getVoiceMailNumberForSubscriber(long subId); /** * Retrieves the complete voice mail number. @@ -124,7 +124,7 @@ interface IPhoneSubInfo { /** * Retrieves the complete voice mail number for particular subId */ - String getCompleteVoiceMailNumberUsingSubId(long subId); + String getCompleteVoiceMailNumberForSubscriber(long subId); /** * Retrieves the alpha identifier associated with the voice mail number. @@ -135,7 +135,7 @@ interface IPhoneSubInfo { * Retrieves the alpha identifier associated with the voice mail number * of a subId. */ - String getVoiceMailAlphaTagUsingSubId(long subId); + String getVoiceMailAlphaTagForSubscriber(long subId); /** * Returns the IMS private user identity (IMPI) that was loaded from the ISIM. diff --git a/telephony/java/com/android/internal/telephony/ISms.aidl b/telephony/java/com/android/internal/telephony/ISms.aidl index abbdc4a..32bb8b4 100644 --- a/telephony/java/com/android/internal/telephony/ISms.aidl +++ b/telephony/java/com/android/internal/telephony/ISms.aidl @@ -47,7 +47,7 @@ interface ISms { * @param subId the subId id. * @return list of SmsRawData of all sms on ICC */ - List getAllMessagesFromIccEfUsingSubId(in long subId, String callingPkg); + List getAllMessagesFromIccEfForSubscriber(in long subId, String callingPkg); /** * Update the specified message on the ICC. @@ -75,7 +75,7 @@ interface ISms { * @return success or not * */ - boolean updateMessageOnIccEfUsingSubId(in long subId, String callingPkg, + boolean updateMessageOnIccEfForSubscriber(in long subId, String callingPkg, int messageIndex, int newStatus, in byte[] pdu); /** @@ -99,7 +99,7 @@ interface ISms { * @return success or not * */ - boolean copyMessageToIccEfUsingSubId(in long subId, String callingPkg, int status, + boolean copyMessageToIccEfForSubscriber(in long subId, String callingPkg, int status, in byte[] pdu, in byte[] smsc); /** @@ -152,7 +152,7 @@ interface ISms { * raw pdu of the status report is in the extended data ("pdu"). * @param subId the subId id. */ - void sendDataUsingSubId(long subId, String callingPkg, in String destAddr, + void sendDataForSubscriber(long subId, String callingPkg, in String destAddr, in String scAddr, in int destPort, in byte[] data, in PendingIntent sentIntent, in PendingIntent deliveryIntent); @@ -206,7 +206,7 @@ interface ISms { * raw pdu of the status report is in the extended data ("pdu"). * @param subId the subId on which the SMS has to be sent. */ - void sendTextUsingSubId(in long subId, String callingPkg, in String destAddr, + void sendTextForSubscriber(in long subId, String callingPkg, in String destAddr, in String scAddr, in String text, in PendingIntent sentIntent, in PendingIntent deliveryIntent); @@ -283,7 +283,7 @@ interface ISms { * extended data ("pdu"). * @param subId the subId on which the SMS has to be sent. */ - void sendMultipartTextUsingSubId(in long subId, String callingPkg, + void sendMultipartTextForSubscriber(in long subId, String callingPkg, in String destinationAddress, in String scAddress, in List parts, in List sentIntents, in List deliveryIntents); @@ -315,7 +315,7 @@ interface ISms { * * @see #disableCellBroadcast(int) */ - boolean enableCellBroadcastUsingSubId(in long subId, int messageIdentifier); + boolean enableCellBroadcastForSubscriber(in long subId, int messageIdentifier); /** * Disable reception of cell broadcast (SMS-CB) messages with the given @@ -344,7 +344,7 @@ interface ISms { * * @see #enableCellBroadcast(int) */ - boolean disableCellBroadcastUsingSubId(in long subId, int messageIdentifier); + boolean disableCellBroadcastForSubscriber(in long subId, int messageIdentifier); /* * Enable reception of cell broadcast (SMS-CB) messages with the given @@ -377,7 +377,7 @@ interface ISms { * * @see #disableCellBroadcastRange(int, int) */ - boolean enableCellBroadcastRangeUsingSubId(long subId, int startMessageId, int endMessageId); + boolean enableCellBroadcastRangeForSubscriber(long subId, int startMessageId, int endMessageId); /** * Disable reception of cell broadcast (SMS-CB) messages with the given @@ -410,7 +410,7 @@ interface ISms { * * @see #enableCellBroadcastRange(int, int, int) */ - boolean disableCellBroadcastRangeUsingSubId(long subId, int startMessageId, + boolean disableCellBroadcastRangeForSubscriber(long subId, int startMessageId, int endMessageId); /** @@ -423,7 +423,7 @@ interface ISms { * Returns the premium SMS send permission for the specified package. * Requires system permission. */ - int getPremiumSmsPermissionUsingSubId(long subId, String packageName); + int getPremiumSmsPermissionForSubscriber(long subId, String packageName); /** * Set the SMS send permission for the specified package. @@ -439,7 +439,7 @@ interface ISms { * Set the SMS send permission for the specified package. * Requires system permission. */ - void setPremiumSmsPermissionUsingSubId(long subId, String packageName, int permission); + void setPremiumSmsPermissionForSubscriber(long subId, String packageName, int permission); /** * SMS over IMS is supported if IMS is registered and SMS is supported @@ -459,7 +459,7 @@ interface ISms { * * @see #getImsSmsFormat() */ - boolean isImsSmsSupportedUsingSubId(long subId); + boolean isImsSmsSupportedForSubscriber(long subId); /* * get user prefered SMS subId @@ -489,7 +489,7 @@ interface ISms { * * @see #isImsSmsSupported() */ - String getImsSmsFormatUsingSubId(long subId); + String getImsSmsFormatForSubscriber(long subId); /* * Get SMS prompt property, enabled or not diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl index 46d0660..b87365e 100755 --- a/telephony/java/com/android/internal/telephony/ISub.aidl +++ b/telephony/java/com/android/internal/telephony/ISub.aidl @@ -25,7 +25,7 @@ interface ISub { * @param subId The unique SubInfoRecord index in database * @return SubInfoRecord, maybe null */ - SubInfoRecord getSubInfoUsingSubId(long subId); + SubInfoRecord getSubInfoForSubscriber(long subId); /** * Get the SubInfoRecord according to an IccId diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 79c72b88..5b280ff 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -59,7 +59,7 @@ interface ITelephony { * @param subId user preferred subId. * @return whether it hung up */ - boolean endCallUsingSubId(long subId); + boolean endCallForSubscriber(long subId); /** * Answer the currently-ringing call. @@ -103,7 +103,7 @@ interface ITelephony { * @param subId user preferred subId. * @return true if the phone state is OFFHOOK. */ - boolean isOffhookUsingSubId(long subId); + boolean isOffhookForSubscriber(long subId); /** * Check if an incoming phone call is ringing or call waiting @@ -112,7 +112,7 @@ interface ITelephony { * @param subId user preferred subId. * @return true if the phone state is RINGING. */ - boolean isRingingUsingSubId(long subId); + boolean isRingingForSubscriber(long subId); /** * Check if an incoming phone call is ringing or call waiting. @@ -132,7 +132,7 @@ interface ITelephony { * @param subId user preferred subId. * @return true if the phone state is IDLE. */ - boolean isIdleUsingSubId(long subId); + boolean isIdleForSubscriber(long subId); /** * Check to see if the radio is on or not. @@ -145,7 +145,7 @@ interface ITelephony { * @param subId user preferred subId. * @return returns true if the radio is on. */ - boolean isRadioOnUsingSubId(long subId); + boolean isRadioOnForSubscriber(long subId); /** * Check if the SIM pin lock is enabled. @@ -167,7 +167,7 @@ interface ITelephony { * @param subId user preferred subId. * @return whether the operation was a success. */ - boolean supplyPinUsingSubId(long subId, String pin); + boolean supplyPinForSubscriber(long subId, String pin); /** * Supply puk to unlock the SIM and set SIM pin to new pin. @@ -186,7 +186,7 @@ interface ITelephony { * @param subId user preferred subId. * @return whether the operation was a success. */ - boolean supplyPukUsingSubId(long subId, String puk, String pin); + boolean supplyPukForSubscriber(long subId, String puk, String pin); /** * Supply a pin to unlock the SIM. Blocks until a result is determined. @@ -204,7 +204,7 @@ interface ITelephony { * @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code * retValue[1] = number of attempts remaining if known otherwise -1 */ - int[] supplyPinReportResultUsingSubId(long subId, String pin); + int[] supplyPinReportResultForSubscriber(long subId, String pin); /** * Supply puk to unlock the SIM and set SIM pin to new pin. @@ -226,7 +226,7 @@ interface ITelephony { * @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code * retValue[1] = number of attempts remaining if known otherwise -1 */ - int[] supplyPukReportResultUsingSubId(long subId, String puk, String pin); + int[] supplyPukReportResultForSubscriber(long subId, String puk, String pin); /** * Handles PIN MMI commands (PIN/PIN2/PUK/PUK2), which are initiated @@ -245,7 +245,7 @@ interface ITelephony { * @param subId user preferred subId. * @return true if MMI command is executed. */ - boolean handlePinMmiUsingSubId(long subId, String dialString); + boolean handlePinMmiForSubscriber(long subId, String dialString); /** * Toggles the radio on or off. @@ -256,7 +256,7 @@ interface ITelephony { * Toggles the radio on or off on particular subId. * @param subId user preferred subId. */ - void toggleRadioOnOffUsingSubId(long subId); + void toggleRadioOnOffForSubscriber(long subId); /** * Set the radio to on or off @@ -267,7 +267,7 @@ interface ITelephony { * Set the radio to on or off on particular subId. * @param subId user preferred subId. */ - boolean setRadioUsingSubId(long subId, boolean turnOn); + boolean setRadioForSubscriber(long subId, boolean turnOn); /** * Set the radio to on or off unconditionally @@ -283,7 +283,7 @@ interface ITelephony { * Request to update location information for a subscrition in service state * @param subId user preferred subId. */ - void updateServiceLocationUsingSubId(long subId); + void updateServiceLocationForSubscriber(long subId); /** * Enable location update notifications. @@ -294,7 +294,7 @@ interface ITelephony { * Enable location update notifications. * @param subId user preferred subId. */ - void enableLocationUpdatesUsingSubId(long subId); + void enableLocationUpdatesForSubscriber(long subId); /** * Disable location update notifications. @@ -305,7 +305,7 @@ interface ITelephony { * Disable location update notifications. * @param subId user preferred subId. */ - void disableLocationUpdatesUsingSubId(long subId); + void disableLocationUpdatesForSubscriber(long subId); /** * Allow mobile data connections. @@ -334,7 +334,7 @@ interface ITelephony { /** * Returns the call state for a subId. */ - int getCallStateUsingSubId(long subId); + int getCallStateForSubscriber(long subId); int getDataActivity(); int getDataState(); @@ -352,7 +352,7 @@ interface ITelephony { * and TelephonyManager.PHONE_TYPE_GSM if RILConstants.GSM_PHONE * @param subId user preferred subId. */ - int getActivePhoneTypeUsingSubId(long subId); + int getActivePhoneTypeForSubscriber(long subId); /** * Returns the CDMA ERI icon index to display @@ -363,7 +363,7 @@ interface ITelephony { * Returns the CDMA ERI icon index to display on particular subId. * @param subId user preferred subId. */ - int getCdmaEriIconIndexUsingSubId(long subId); + int getCdmaEriIconIndexForSubscriber(long subId); /** * Returns the CDMA ERI icon mode, @@ -378,7 +378,7 @@ interface ITelephony { * 1 - FLASHING * @param subId user preferred subId. */ - int getCdmaEriIconModeUsingSubId(long subId); + int getCdmaEriIconModeForSubscriber(long subId); /** * Returns the CDMA ERI text, @@ -389,7 +389,7 @@ interface ITelephony { * Returns the CDMA ERI text for particular subId, * @param subId user preferred subId. */ - String getCdmaEriTextUsingSubId(long subId); + String getCdmaEriTextForSubscriber(long subId); /** * Returns true if OTA service provisioning needs to run. @@ -408,7 +408,7 @@ interface ITelephony { * @param subId user preferred subId. * Returns the unread count of voicemails */ - int getVoiceMessageCountUsingSubId(long subId); + int getVoiceMessageCountForSubscriber(long subId); /** * Returns the network type for data transmission @@ -420,7 +420,7 @@ interface ITelephony { * @param subId user preferred subId. * Returns the network type */ - int getNetworkTypeUsingSubId(long subId); + int getNetworkTypeForSubscriber(long subId); /** * Returns the network type for data transmission @@ -432,7 +432,7 @@ interface ITelephony { * @param subId user preferred subId. * Returns the network type */ - int getDataNetworkTypeUsingSubId(long subId); + int getDataNetworkTypeForSubscriber(long subId); /** * Returns the network type for voice @@ -444,7 +444,7 @@ interface ITelephony { * @param subId user preferred subId. * Returns the network type */ - int getVoiceNetworkTypeUsingSubId(long subId); + int getVoiceNetworkTypeForSubscriber(long subId); /** * Return true if an ICC card is present @@ -476,7 +476,7 @@ interface ITelephony { * @return {@link Phone#LTE_ON_CDMA_UNKNOWN}, {@link Phone#LTE_ON_CDMA_FALSE} * or {@link PHone#LTE_ON_CDMA_TRUE} */ - int getLteOnCdmaModeUsingSubId(long subId); + int getLteOnCdmaModeForSubscriber(long subId); /** * Returns the all observed cell information of the device. diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl index fd2d1c7..d776833 100644 --- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -30,30 +30,30 @@ import com.android.internal.telephony.IPhoneStateListener; interface ITelephonyRegistry { void listen(String pkg, IPhoneStateListener callback, int events, boolean notifyNow); - void listenUsingSubId(in long subId, String pkg, IPhoneStateListener callback, int events, + void listenForSubscriber(in long subId, String pkg, IPhoneStateListener callback, int events, boolean notifyNow); void notifyCallState(int state, String incomingNumber); - void notifyCallStateUsingSubId(in long subId, int state, String incomingNumber); + void notifyCallStateForSubscriber(in long subId, int state, String incomingNumber); void notifyServiceState(in ServiceState state); - void notifyServiceStateUsingSubId(in long subId, in ServiceState state); + void notifyServiceStateForSubscriber(in long subId, in ServiceState state); void notifySignalStrength(in SignalStrength signalStrength); - void notifySignalStrengthUsingSubId(in long subId, in SignalStrength signalStrength); + void notifySignalStrengthForSubscriber(in long subId, in SignalStrength signalStrength); void notifyMessageWaitingChanged(boolean mwi); - void notifyMessageWaitingChangedUsingSubId(in long subId, boolean mwi); + void notifyMessageWaitingChangedForSubscriber(in long subId, boolean mwi); void notifyCallForwardingChanged(boolean cfi); - void notifyCallForwardingChangedUsingSubId(in long subId, boolean cfi); + void notifyCallForwardingChangedForSubscriber(in long subId, boolean cfi); void notifyDataActivity(int state); - void notifyDataActivityUsingSubId(in long subId, int state); + void notifyDataActivityForSubscriber(in long subId, int state); void notifyDataConnection(int state, boolean isDataConnectivityPossible, String reason, String apn, String apnType, in LinkProperties linkProperties, in NetworkCapabilities networkCapabilities, int networkType, boolean roaming); - void notifyDataConnectionUsingSubId(long subId, int state, boolean isDataConnectivityPossible, + void notifyDataConnectionForSubscriber(long subId, int state, boolean isDataConnectivityPossible, String reason, String apn, String apnType, in LinkProperties linkProperties, in NetworkCapabilities networkCapabilities, int networkType, boolean roaming); void notifyDataConnectionFailed(String reason, String apnType); - void notifyDataConnectionFailedUsingSubId(long subId, String reason, String apnType); + void notifyDataConnectionFailedForSubscriber(long subId, String reason, String apnType); void notifyCellLocation(in Bundle cellLocation); - void notifyCellLocationUsingSubId(in long subId, in Bundle cellLocation); + void notifyCellLocationForSubscriber(in long subId, in Bundle cellLocation); void notifyOtaspChanged(in int otaspMode); void notifyCellInfo(in List cellInfo); void notifyPreciseCallState(int ringingCallState, int foregroundCallState, @@ -61,7 +61,7 @@ interface ITelephonyRegistry { void notifyDisconnectCause(int disconnectCause, int preciseDisconnectCause); void notifyPreciseDataConnectionFailed(String reason, String apnType, String apn, String failCause); - void notifyCellInfoUsingSubId(in long subId, in List cellInfo); + void notifyCellInfoForSubscriber(in long subId, in List cellInfo); void notifyDataConnectionRealTimeInfo(in DataConnectionRealTimeInfo dcRtInfo); void notifyVoLteServiceStateChanged(in VoLteServiceState lteState); } -- cgit v1.1