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

am 5dac65ad: Change suffix UsingSubId to ForSubscriber.

Browse Source 
* commit '5dac65ad043ee9d0535813ef5dba06dd80c11f82':
  Change suffix UsingSubId to ForSubscriber.
This commit is contained in:
Wink Saville
2014-09-09 17:46:53 +00:00
committed by Android Git Automerger
parent 3eeb09605d bc0272754d
commit 5c1659045d
8 changed files with 135 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -196,7 +196,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (VDBG) log("MSG_USER_SWITCHED userId=" + msg.arg1);
int numPhones = TelephonyManager.getDefault().getPhoneCount();
for (int sub = 0; sub < numPhones; sub++) {
TelephonyRegistry.this.notifyCellLocationUsingSubId(sub,
TelephonyRegistry.this.notifyCellLocationForSubscriber(sub,
mCellLocation[sub]);
}
break;
@@ -326,7 +326,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
@Override
public void listenUsingSubId(long subId, String pkgForDebug, IPhoneStateListener callback,
public void listenForSubscriber(long subId, String pkgForDebug, IPhoneStateListener callback,
int events, boolean notifyNow) {
listen(pkgForDebug, callback, events, notifyNow, subId, false);
}
@@ -542,12 +542,12 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
broadcastCallStateChanged(state, incomingNumber, mDefaultSubId);
}
public void notifyCallStateUsingSubId(long subId, int state, String incomingNumber) {
public void notifyCallStateForSubscriber(long subId, int state, String incomingNumber) {
if (!checkNotifyPermission("notifyCallState()")) {
return;
}
if (VDBG) {
log("notifyCallStateUsingSubId: subId=" + subId
log("notifyCallStateForSubscriber: subId=" + subId
+ " state=" + state + " incomingNumber=" + incomingNumber);
}
synchronized (mRecords) {
@@ -573,38 +573,38 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
public void notifyServiceState(ServiceState state) {
notifyServiceStateUsingSubId(mDefaultSubId, state);
notifyServiceStateForSubscriber(mDefaultSubId, state);
}
public void notifyServiceStateUsingSubId(long subId, ServiceState state) {
public void notifyServiceStateForSubscriber(long subId, ServiceState state) {
if (!checkNotifyPermission("notifyServiceState()")){
return;
}
if (subId == SubscriptionManager.DEFAULT_SUB_ID) {
subId = mDefaultSubId;
if (VDBG) log("notifyServiceStateUsingSubId: using mDefaultSubId=" + mDefaultSubId);
if (VDBG) log("notifyServiceStateForSubscriber: using mDefaultSubId=" + mDefaultSubId);
}
synchronized (mRecords) {
int phoneId = SubscriptionManager.getPhoneId(subId);
if (VDBG) {
log("notifyServiceStateUsingSubId: subId=" + subId + " phoneId=" + phoneId
log("notifyServiceStateForSubscriber: subId=" + subId + " phoneId=" + phoneId
+ " state=" + state);
}
if (validatePhoneId(phoneId)) {
mServiceState[phoneId] = state;
logServiceStateChanged("notifyServiceStateUsingSubId", subId, phoneId, state);
if (VDBG) toStringLogSSC("notifyServiceStateUsingSubId");
logServiceStateChanged("notifyServiceStateForSubscriber", subId, phoneId, state);
if (VDBG) toStringLogSSC("notifyServiceStateForSubscriber");
for (Record r : mRecords) {
if (VDBG) {
log("notifyServiceStateUsingSubId: r=" + r + " subId=" + subId
log("notifyServiceStateForSubscriber: r=" + r + " subId=" + subId
+ " phoneId=" + phoneId + " state=" + state);
}
if (((r.events & PhoneStateListener.LISTEN_SERVICE_STATE) != 0) &&
(r.phoneId == phoneId)) {
try {
if (DBG) {
log("notifyServiceStateUsingSubId: callback.onSSC r=" + r
log("notifyServiceStateForSubscriber: callback.onSSC r=" + r
+ " subId=" + subId + " phoneId=" + phoneId
+ " state=" + state);
}
@@ -615,7 +615,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
}
} else {
log("notifyServiceStateUsingSubId: INVALID phoneId=" + phoneId);
log("notifyServiceStateForSubscriber: INVALID phoneId=" + phoneId);
}
handleRemoveListLocked();
}
@@ -623,33 +623,33 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
public void notifySignalStrength(SignalStrength signalStrength) {
notifySignalStrengthUsingSubId(mDefaultSubId, signalStrength);
notifySignalStrengthForSubscriber(mDefaultSubId, signalStrength);
}
public void notifySignalStrengthUsingSubId(long subId, SignalStrength signalStrength) {
public void notifySignalStrengthForSubscriber(long subId, SignalStrength signalStrength) {
if (!checkNotifyPermission("notifySignalStrength()")) {
return;
}
if (VDBG) {
log("notifySignalStrengthUsingSubId: subId=" + subId
log("notifySignalStrengthForSubscriber: subId=" + subId
+ " signalStrength=" + signalStrength);
toStringLogSSC("notifySignalStrengthUsingSubId");
toStringLogSSC("notifySignalStrengthForSubscriber");
}
synchronized (mRecords) {
int phoneId = SubscriptionManager.getPhoneId(subId);
if (validatePhoneId(phoneId)) {
if (VDBG) log("notifySignalStrengthUsingSubId: valid phoneId=" + phoneId);
if (VDBG) log("notifySignalStrengthForSubscriber: valid phoneId=" + phoneId);
mSignalStrength[phoneId] = signalStrength;
for (Record r : mRecords) {
if (VDBG) {
log("notifySignalStrengthUsingSubId: r=" + r + " subId=" + subId
log("notifySignalStrengthForSubscriber: r=" + r + " subId=" + subId
+ " phoneId=" + phoneId + " ss=" + signalStrength);
}
if (((r.events & PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) != 0) &&
(r.phoneId == phoneId)) {
try {
if (DBG) {
log("notifySignalStrengthUsingSubId: callback.onSsS r=" + r
log("notifySignalStrengthForSubscriber: callback.onSsS r=" + r
+ " subId=" + subId + " phoneId=" + phoneId
+ " ss=" + signalStrength);
}
@@ -664,7 +664,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
int gsmSignalStrength = signalStrength.getGsmSignalStrength();
int ss = (gsmSignalStrength == 99 ? -1 : gsmSignalStrength);
if (DBG) {
log("notifySignalStrengthUsingSubId: callback.onSS r=" + r
log("notifySignalStrengthForSubscriber: callback.onSS r=" + r
+ " subId=" + subId + " phoneId=" + phoneId
+ " gsmSS=" + gsmSignalStrength + " ss=" + ss);
}
@@ -675,7 +675,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
}
} else {
log("notifySignalStrengthUsingSubId: invalid phoneId=" + phoneId);
log("notifySignalStrengthForSubscriber: invalid phoneId=" + phoneId);
}
handleRemoveListLocked();
}
@@ -683,15 +683,15 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
public void notifyCellInfo(List<CellInfo> cellInfo) {
notifyCellInfoUsingSubId(mDefaultSubId, cellInfo);
notifyCellInfoForSubscriber(mDefaultSubId, cellInfo);
}
public void notifyCellInfoUsingSubId(long subId, List<CellInfo> cellInfo) {
public void notifyCellInfoForSubscriber(long subId, List<CellInfo> cellInfo) {
if (!checkNotifyPermission("notifyCellInfo()")) {
return;
}
if (VDBG) {
log("notifyCellInfoUsingSubId: subId=" + subId
log("notifyCellInfoForSubscriber: subId=" + subId
+ " cellInfo=" + cellInfo);
}
@@ -743,15 +743,15 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
public void notifyMessageWaitingChanged(boolean mwi) {
notifyMessageWaitingChangedUsingSubId(mDefaultSubId, mwi);
notifyMessageWaitingChangedForSubscriber(mDefaultSubId, mwi);
}
public void notifyMessageWaitingChangedUsingSubId(long subId, boolean mwi) {
public void notifyMessageWaitingChangedForSubscriber(long subId, boolean mwi) {
if (!checkNotifyPermission("notifyMessageWaitingChanged()")) {
return;
}
if (VDBG) {
log("notifyMessageWaitingChangedUsingSubId: subId=" + subId
log("notifyMessageWaitingChangedForSubscriber: subId=" + subId
+ " mwi=" + mwi);
}
synchronized (mRecords) {
@@ -774,15 +774,15 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
public void notifyCallForwardingChanged(boolean cfi) {
notifyCallForwardingChangedUsingSubId(mDefaultSubId, cfi);
notifyCallForwardingChangedForSubscriber(mDefaultSubId, cfi);
}
public void notifyCallForwardingChangedUsingSubId(long subId, boolean cfi) {
public void notifyCallForwardingChangedForSubscriber(long subId, boolean cfi) {
if (!checkNotifyPermission("notifyCallForwardingChanged()")) {
return;
}
if (VDBG) {
log("notifyCallForwardingChangedUsingSubId: subId=" + subId
log("notifyCallForwardingChangedForSubscriber: subId=" + subId
+ " cfi=" + cfi);
}
synchronized (mRecords) {
@@ -805,10 +805,10 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
public void notifyDataActivity(int state) {
notifyDataActivityUsingSubId(mDefaultSubId, state);
notifyDataActivityForSubscriber(mDefaultSubId, state);
}
public void notifyDataActivityUsingSubId(long subId, int state) {
public void notifyDataActivityForSubscriber(long subId, int state) {
if (!checkNotifyPermission("notifyDataActivity()" )) {
return;
}
@@ -831,12 +831,12 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
public void notifyDataConnection(int state, boolean isDataConnectivityPossible,
String reason, String apn, String apnType, LinkProperties linkProperties,
NetworkCapabilities networkCapabilities, int networkType, boolean roaming) {
notifyDataConnectionUsingSubId(mDefaultSubId, state, isDataConnectivityPossible,
notifyDataConnectionForSubscriber(mDefaultSubId, state, isDataConnectivityPossible,
reason, apn, apnType, linkProperties,
networkCapabilities, networkType, roaming);
}
public void notifyDataConnectionUsingSubId(long subId, int state,
public void notifyDataConnectionForSubscriber(long subId, int state,
boolean isDataConnectivityPossible, String reason, String apn, String apnType,
LinkProperties linkProperties, NetworkCapabilities networkCapabilities,
int networkType, boolean roaming) {
@@ -844,7 +844,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
return;
}
if (VDBG) {
log("notifyDataConnectionUsingSubId: subId=" + subId
log("notifyDataConnectionForSubscriber: subId=" + subId
+ " state=" + state + " isDataConnectivityPossible=" + isDataConnectivityPossible
+ " reason='" + reason
+ "' apn='" + apn + "' apnType=" + apnType + " networkType=" + networkType
@@ -921,16 +921,16 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
public void notifyDataConnectionFailed(String reason, String apnType) {
notifyDataConnectionFailedUsingSubId(mDefaultSubId, reason, apnType);
notifyDataConnectionFailedForSubscriber(mDefaultSubId, reason, apnType);
}
public void notifyDataConnectionFailedUsingSubId(long subId,
public void notifyDataConnectionFailedForSubscriber(long subId,
String reason, String apnType) {
if (!checkNotifyPermission("notifyDataConnectionFailed()")) {
return;
}
if (VDBG) {
log("notifyDataConnectionFailedUsingSubId: subId=" + subId
log("notifyDataConnectionFailedForSubscriber: subId=" + subId
+ " reason=" + reason + " apnType=" + apnType);
}
synchronized (mRecords) {
@@ -954,17 +954,17 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
}
public void notifyCellLocation(Bundle cellLocation) {
notifyCellLocationUsingSubId(mDefaultSubId, cellLocation);
notifyCellLocationForSubscriber(mDefaultSubId, cellLocation);
}
public void notifyCellLocationUsingSubId(long subId, Bundle cellLocation) {
log("notifyCellLocationUsingSubId: subId=" + subId
public void notifyCellLocationForSubscriber(long subId, Bundle cellLocation) {
log("notifyCellLocationForSubscriber: subId=" + subId
+ " cellLocation=" + cellLocation);
if (!checkNotifyPermission("notifyCellLocation()")) {
return;
}
if (VDBG) {
log("notifyCellLocationUsingSubId: subId=" + subId
log("notifyCellLocationForSubscriber: subId=" + subId
+ " cellLocation=" + cellLocation);
}
synchronized (mRecords) {

12
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -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 */

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

@@ -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() : "<unknown>";
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;

22
telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
View File

@@ -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.

28
telephony/java/com/android/internal/telephony/ISms.aidl
View File

@@ -47,7 +47,7 @@ interface ISms {
* @param subId the subId id.
* @return list of SmsRawData of all sms on ICC
*/
List<SmsRawData> getAllMessagesFromIccEfUsingSubId(in long subId, String callingPkg);
List<SmsRawData> 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<String> parts, in List<PendingIntent> sentIntents,
in List<PendingIntent> 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

2
telephony/java/com/android/internal/telephony/ISub.aidl
View File

@@ -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

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

@@ -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.

22
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl
View File

@@ -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> 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> cellInfo);
void notifyCellInfoForSubscriber(in long subId, in List<CellInfo> cellInfo);
void notifyDataConnectionRealTimeInfo(in DataConnectionRealTimeInfo dcRtInfo);
void notifyVoLteServiceStateChanged(in VoLteServiceState lteState);
}