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

Merge "Change subId to int from long" into lmp-mr1-dev

Browse Source
This commit is contained in:
Wink Saville
2014-10-27 17:34:46 +00:00
committed by Android (Google) Code Review
parent 2ad5eb538d 63f03dd94c
commit 4dec130c39
17 changed files with 247 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/current.txt
View File

@@ -28715,8 +28715,8 @@ package android.telephony {
method public void downloadMultimediaMessage(android.content.Context, java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent); method public void downloadMultimediaMessage(android.content.Context, java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent);
method public android.os.Bundle getCarrierConfigValues(); method public android.os.Bundle getCarrierConfigValues();
method public static android.telephony.SmsManager getDefault(); method public static android.telephony.SmsManager getDefault();
method public static android.telephony.SmsManager getSmsManagerForSubscriber(long); method public static android.telephony.SmsManager getSmsManagerForSubscriber(int);
method public long getSubId(); method public int getSubId();
method public void injectSmsPdu(byte[], java.lang.String, android.app.PendingIntent); method public void injectSmsPdu(byte[], java.lang.String, android.app.PendingIntent);
method public void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent); method public void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent);
method public void sendMultimediaMessage(android.content.Context, android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent); method public void sendMultimediaMessage(android.content.Context, android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent);
@@ -28834,7 +28834,7 @@ package android.telephony {
public class SubInfoRecord implements android.os.Parcelable { public class SubInfoRecord implements android.os.Parcelable {
ctor public SubInfoRecord(); ctor public SubInfoRecord();
ctor public SubInfoRecord(long, java.lang.String, int, java.lang.String, int, int, java.lang.String, int, int, int[], int, int); ctor public SubInfoRecord(int, java.lang.String, int, java.lang.String, int, int, java.lang.String, int, int, int[], int, int);
method public int describeContents(); method public int describeContents();
method public int getColor(); method public int getColor();
method public android.graphics.drawable.BitmapDrawable getIconDrawable(); method public android.graphics.drawable.BitmapDrawable getIconDrawable();
@@ -28852,22 +28852,22 @@ package android.telephony {
field public java.lang.String number; field public java.lang.String number;
field public int[] simIconRes; field public int[] simIconRes;
field public int slotId; field public int slotId;
field public long subId; field public int subId;
} }
public class SubscriptionManager implements android.provider.BaseColumns { public class SubscriptionManager implements android.provider.BaseColumns {
method public static java.util.List<android.telephony.SubInfoRecord> getActiveSubInfoList(); method public static java.util.List<android.telephony.SubInfoRecord> getActiveSubInfoList();
method public static long getDefaultSmsSubId(); method public static int getDefaultSmsSubId();
method public static int getSlotId(long); method public static int getSlotId(int);
method public static android.telephony.SubInfoRecord getSubInfoForSubscriber(long); method public static android.telephony.SubInfoRecord getSubInfoForSubscriber(int);
method public static java.util.List<android.telephony.SubInfoRecord> getSubInfoUsingSlotId(int); method public static java.util.List<android.telephony.SubInfoRecord> getSubInfoUsingSlotId(int);
method public static boolean isValidSubId(long); method public static boolean isValidSubId(int);
field public static final long ASK_USER_SUB_ID = -1001L; // 0xfffffffffffffc17L field public static final int ASK_USER_SUB_ID = -1001; // 0xfffffc17
field public static final int DEFAULT_PHONE_ID = 2147483647; // 0x7fffffff field public static final int DEFAULT_PHONE_ID = 2147483647; // 0x7fffffff
field public static final long DEFAULT_SUB_ID = 9223372036854775807L; // 0x7fffffffffffffffL field public static final int DEFAULT_SUB_ID = 2147483647; // 0x7fffffff
field public static final int INVALID_PHONE_ID = -1000; // 0xfffffc18 field public static final int INVALID_PHONE_ID = -1000; // 0xfffffc18
field public static final int INVALID_SLOT_ID = -1000; // 0xfffffc18 field public static final int INVALID_SLOT_ID = -1000; // 0xfffffc18
field public static final long INVALID_SUB_ID = -1000L; // 0xfffffffffffffc18L field public static final int INVALID_SUB_ID = -1000; // 0xfffffc18
field public static final java.lang.String MCC = "mcc"; field public static final java.lang.String MCC = "mcc";
field public static final java.lang.String MNC = "mnc"; field public static final java.lang.String MNC = "mnc";
field public static final int SIM_NOT_INSERTED = -1; // 0xffffffff field public static final int SIM_NOT_INSERTED = -1; // 0xffffffff

8
services/core/java/com/android/server/MmsServiceBroker.java
View File

@@ -219,7 +219,7 @@ public class MmsServiceBroker extends SystemService {
// Service API calls implementation, proxied to the real MmsService in "com.android.mms.service" // Service API calls implementation, proxied to the real MmsService in "com.android.mms.service"
private final class BinderService extends IMms.Stub { private final class BinderService extends IMms.Stub {
@Override @Override
public void sendMessage(long subId, String callingPkg, Uri contentUri, public void sendMessage(int subId, String callingPkg, Uri contentUri,
String locationUrl, Bundle configOverrides, PendingIntent sentIntent) String locationUrl, Bundle configOverrides, PendingIntent sentIntent)
throws RemoteException { throws RemoteException {
mContext.enforceCallingPermission(Manifest.permission.SEND_SMS, "Send MMS message"); mContext.enforceCallingPermission(Manifest.permission.SEND_SMS, "Send MMS message");
@@ -232,7 +232,7 @@ public class MmsServiceBroker extends SystemService {
} }
@Override @Override
public void downloadMessage(long subId, String callingPkg, String locationUrl, public void downloadMessage(int subId, String callingPkg, String locationUrl,
Uri contentUri, Bundle configOverrides, Uri contentUri, Bundle configOverrides,
PendingIntent downloadedIntent) throws RemoteException { PendingIntent downloadedIntent) throws RemoteException {
mContext.enforceCallingPermission(Manifest.permission.RECEIVE_MMS, mContext.enforceCallingPermission(Manifest.permission.RECEIVE_MMS,
@@ -259,7 +259,7 @@ public class MmsServiceBroker extends SystemService {
} }
@Override @Override
public Bundle getCarrierConfigValues(long subId) throws RemoteException { public Bundle getCarrierConfigValues(int subId) throws RemoteException {
return getServiceGuarded().getCarrierConfigValues(subId); return getServiceGuarded().getCarrierConfigValues(subId);
} }
@@ -360,7 +360,7 @@ public class MmsServiceBroker extends SystemService {
} }
@Override @Override
public void sendStoredMessage(long subId, String callingPkg, Uri messageUri, public void sendStoredMessage(int subId, String callingPkg, Uri messageUri,
Bundle configOverrides, PendingIntent sentIntent) throws RemoteException { Bundle configOverrides, PendingIntent sentIntent) throws RemoteException {
mContext.enforceCallingPermission(Manifest.permission.SEND_SMS, mContext.enforceCallingPermission(Manifest.permission.SEND_SMS,
"Send stored MMS message"); "Send stored MMS message");

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

@@ -72,7 +72,7 @@ import com.android.server.am.BatteryStatsService;
* and 15973975 by saving the phoneId of the registrant and then using the * and 15973975 by saving the phoneId of the registrant and then using the
* phoneId when deciding to to make a callback. This is necessary because * phoneId when deciding to to make a callback. This is necessary because
* a subId changes from to a dummy value when a SIM is removed and thus won't * a subId changes from to a dummy value when a SIM is removed and thus won't
* compare properly. Because SubscriptionManager.getPhoneId(long subId) handles * compare properly. Because SubscriptionManager.getPhoneId(int subId) handles
* the dummy value conversion we properly do the callbacks. * the dummy value conversion we properly do the callbacks.
* *
* Eventually we may want to remove the notion of dummy value but for now this * Eventually we may want to remove the notion of dummy value but for now this
@@ -95,7 +95,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
int events; int events;
long subId; int subId;
int phoneId; int phoneId;
@@ -154,7 +154,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
private VoLteServiceState mVoLteServiceState = new VoLteServiceState(); private VoLteServiceState mVoLteServiceState = new VoLteServiceState();
private long mDefaultSubId = SubscriptionManager.INVALID_SUB_ID; private int mDefaultSubId = SubscriptionManager.INVALID_SUB_ID;
private int mDefaultPhoneId = SubscriptionManager.INVALID_PHONE_ID; private int mDefaultPhoneId = SubscriptionManager.INVALID_PHONE_ID;
@@ -201,7 +201,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
case MSG_UPDATE_DEFAULT_SUB: { case MSG_UPDATE_DEFAULT_SUB: {
int newDefaultPhoneId = msg.arg1; int newDefaultPhoneId = msg.arg1;
long newDefaultSubId = (Long)(msg.obj); int newDefaultSubId = (Integer)(msg.obj);
if (VDBG) { if (VDBG) {
log("MSG_UPDATE_DEFAULT_SUB:current mDefaultSubId=" + mDefaultSubId log("MSG_UPDATE_DEFAULT_SUB:current mDefaultSubId=" + mDefaultSubId
+ " current mDefaultPhoneId=" + mDefaultPhoneId + " newDefaultSubId= " + " current mDefaultPhoneId=" + mDefaultPhoneId + " newDefaultSubId= "
@@ -236,7 +236,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
if (DBG) log("onReceive: userHandle=" + userHandle); if (DBG) log("onReceive: userHandle=" + userHandle);
mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_SWITCHED, userHandle, 0)); mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_SWITCHED, userHandle, 0));
} else if (action.equals(TelephonyIntents.ACTION_DEFAULT_SUBSCRIPTION_CHANGED)) { } else if (action.equals(TelephonyIntents.ACTION_DEFAULT_SUBSCRIPTION_CHANGED)) {
Long newDefaultSubIdObj = new Long(intent.getLongExtra( Integer newDefaultSubIdObj = new Integer(intent.getIntExtra(
PhoneConstants.SUBSCRIPTION_KEY, SubscriptionManager.getDefaultSubId())); PhoneConstants.SUBSCRIPTION_KEY, SubscriptionManager.getDefaultSubId()));
int newDefaultPhoneId = intent.getIntExtra(PhoneConstants.SLOT_KEY, int newDefaultPhoneId = intent.getIntExtra(PhoneConstants.SLOT_KEY,
SubscriptionManager.getPhoneId(mDefaultSubId)); SubscriptionManager.getPhoneId(mDefaultSubId));
@@ -332,13 +332,13 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
@Override @Override
public void listenForSubscriber(long subId, String pkgForDebug, IPhoneStateListener callback, public void listenForSubscriber(int subId, String pkgForDebug, IPhoneStateListener callback,
int events, boolean notifyNow) { int events, boolean notifyNow) {
listen(pkgForDebug, callback, events, notifyNow, subId); listen(pkgForDebug, callback, events, notifyNow, subId);
} }
private void listen(String pkgForDebug, IPhoneStateListener callback, int events, private void listen(String pkgForDebug, IPhoneStateListener callback, int events,
boolean notifyNow, long subId) { boolean notifyNow, int subId) {
int callerUid = UserHandle.getCallingUserId(); int callerUid = UserHandle.getCallingUserId();
int myUid = UserHandle.myUserId(); int myUid = UserHandle.myUserId();
if (VDBG) { if (VDBG) {
@@ -545,7 +545,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
broadcastCallStateChanged(state, incomingNumber, SubscriptionManager.DEFAULT_SUB_ID); broadcastCallStateChanged(state, incomingNumber, SubscriptionManager.DEFAULT_SUB_ID);
} }
public void notifyCallStateForSubscriber(long subId, int state, String incomingNumber) { public void notifyCallStateForSubscriber(int subId, int state, String incomingNumber) {
if (!checkNotifyPermission("notifyCallState()")) { if (!checkNotifyPermission("notifyCallState()")) {
return; return;
} }
@@ -575,7 +575,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
broadcastCallStateChanged(state, incomingNumber, subId); broadcastCallStateChanged(state, incomingNumber, subId);
} }
public void notifyServiceStateForPhoneId(int phoneId, long subId, ServiceState state) { public void notifyServiceStateForPhoneId(int phoneId, int subId, ServiceState state) {
if (!checkNotifyPermission("notifyServiceState()")){ if (!checkNotifyPermission("notifyServiceState()")){
return; return;
} }
@@ -621,7 +621,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
notifySignalStrengthForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, signalStrength); notifySignalStrengthForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, signalStrength);
} }
public void notifySignalStrengthForSubscriber(long subId, SignalStrength signalStrength) { public void notifySignalStrengthForSubscriber(int subId, SignalStrength signalStrength) {
if (!checkNotifyPermission("notifySignalStrength()")) { if (!checkNotifyPermission("notifySignalStrength()")) {
return; return;
} }
@@ -681,7 +681,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
notifyCellInfoForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, cellInfo); notifyCellInfoForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, cellInfo);
} }
public void notifyCellInfoForSubscriber(long subId, List<CellInfo> cellInfo) { public void notifyCellInfoForSubscriber(int subId, List<CellInfo> cellInfo) {
if (!checkNotifyPermission("notifyCellInfo()")) { if (!checkNotifyPermission("notifyCellInfo()")) {
return; return;
} }
@@ -738,7 +738,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
@Override @Override
public void notifyMessageWaitingChangedForPhoneId(int phoneId, long subId, boolean mwi) { public void notifyMessageWaitingChangedForPhoneId(int phoneId, int subId, boolean mwi) {
if (!checkNotifyPermission("notifyMessageWaitingChanged()")) { if (!checkNotifyPermission("notifyMessageWaitingChanged()")) {
return; return;
} }
@@ -768,7 +768,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
notifyCallForwardingChangedForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, cfi); notifyCallForwardingChangedForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, cfi);
} }
public void notifyCallForwardingChangedForSubscriber(long subId, boolean cfi) { public void notifyCallForwardingChangedForSubscriber(int subId, boolean cfi) {
if (!checkNotifyPermission("notifyCallForwardingChanged()")) { if (!checkNotifyPermission("notifyCallForwardingChanged()")) {
return; return;
} }
@@ -799,7 +799,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
notifyDataActivityForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, state); notifyDataActivityForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, state);
} }
public void notifyDataActivityForSubscriber(long subId, int state) { public void notifyDataActivityForSubscriber(int subId, int state) {
if (!checkNotifyPermission("notifyDataActivity()" )) { if (!checkNotifyPermission("notifyDataActivity()" )) {
return; return;
} }
@@ -827,7 +827,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
networkCapabilities, networkType, roaming); networkCapabilities, networkType, roaming);
} }
public void notifyDataConnectionForSubscriber(long subId, int state, public void notifyDataConnectionForSubscriber(int subId, int state,
boolean isDataConnectivityPossible, String reason, String apn, String apnType, boolean isDataConnectivityPossible, String reason, String apn, String apnType,
LinkProperties linkProperties, NetworkCapabilities networkCapabilities, LinkProperties linkProperties, NetworkCapabilities networkCapabilities,
int networkType, boolean roaming) { int networkType, boolean roaming) {
@@ -916,7 +916,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
reason, apnType); reason, apnType);
} }
public void notifyDataConnectionFailedForSubscriber(long subId, public void notifyDataConnectionFailedForSubscriber(int subId,
String reason, String apnType) { String reason, String apnType) {
if (!checkNotifyPermission("notifyDataConnectionFailed()")) { if (!checkNotifyPermission("notifyDataConnectionFailed()")) {
return; return;
@@ -949,7 +949,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
notifyCellLocationForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, cellLocation); notifyCellLocationForSubscriber(SubscriptionManager.DEFAULT_SUB_ID, cellLocation);
} }
public void notifyCellLocationForSubscriber(long subId, Bundle cellLocation) { public void notifyCellLocationForSubscriber(int subId, Bundle cellLocation) {
log("notifyCellLocationForSubscriber: subId=" + subId log("notifyCellLocationForSubscriber: subId=" + subId
+ " cellLocation=" + cellLocation); + " cellLocation=" + cellLocation);
if (!checkNotifyPermission("notifyCellLocation()")) { if (!checkNotifyPermission("notifyCellLocation()")) {
@@ -1096,7 +1096,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
} }
public void notifyOemHookRawEventForSubscriber(long subId, byte[] rawData) { public void notifyOemHookRawEventForSubscriber(int subId, byte[] rawData) {
if (!checkNotifyPermission("notifyOemHookRawEventForSubscriber")) { if (!checkNotifyPermission("notifyOemHookRawEventForSubscriber")) {
return; return;
} }
@@ -1162,7 +1162,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
// the legacy intent broadcasting // the legacy intent broadcasting
// //
private void broadcastServiceStateChanged(ServiceState state, long subId) { private void broadcastServiceStateChanged(ServiceState state, int subId) {
long ident = Binder.clearCallingIdentity(); long ident = Binder.clearCallingIdentity();
try { try {
mBatteryStats.notePhoneState(state.getState()); mBatteryStats.notePhoneState(state.getState());
@@ -1181,7 +1181,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
} }
private void broadcastSignalStrengthChanged(SignalStrength signalStrength, long subId) { private void broadcastSignalStrengthChanged(SignalStrength signalStrength, int subId) {
long ident = Binder.clearCallingIdentity(); long ident = Binder.clearCallingIdentity();
try { try {
mBatteryStats.notePhoneSignalStrength(signalStrength); mBatteryStats.notePhoneSignalStrength(signalStrength);
@@ -1200,7 +1200,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
} }
private void broadcastCallStateChanged(int state, String incomingNumber, long subId) { private void broadcastCallStateChanged(int state, String incomingNumber, int subId) {
long ident = Binder.clearCallingIdentity(); long ident = Binder.clearCallingIdentity();
try { try {
if (state == TelephonyManager.CALL_STATE_IDLE) { if (state == TelephonyManager.CALL_STATE_IDLE) {
@@ -1228,7 +1228,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
private void broadcastDataConnectionStateChanged(int state, private void broadcastDataConnectionStateChanged(int state,
boolean isDataConnectivityPossible, boolean isDataConnectivityPossible,
String reason, String apn, String apnType, LinkProperties linkProperties, String reason, String apn, String apnType, LinkProperties linkProperties,
NetworkCapabilities networkCapabilities, boolean roaming, long subId) { NetworkCapabilities networkCapabilities, boolean roaming, int subId) {
// Note: not reporting to the battery stats service here, because the // Note: not reporting to the battery stats service here, because the
// status bar takes care of that after taking into account all of the // status bar takes care of that after taking into account all of the
// required info. // required info.
@@ -1260,7 +1260,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
private void broadcastDataConnectionFailed(String reason, String apnType, private void broadcastDataConnectionFailed(String reason, String apnType,
long subId) { int subId) {
Intent intent = new Intent(TelephonyIntents.ACTION_DATA_CONNECTION_FAILED); Intent intent = new Intent(TelephonyIntents.ACTION_DATA_CONNECTION_FAILED);
intent.putExtra(PhoneConstants.FAILURE_REASON_KEY, reason); intent.putExtra(PhoneConstants.FAILURE_REASON_KEY, reason);
intent.putExtra(PhoneConstants.DATA_APN_TYPE_KEY, apnType); intent.putExtra(PhoneConstants.DATA_APN_TYPE_KEY, apnType);
@@ -1376,11 +1376,11 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
private static class LogSSC { private static class LogSSC {
private Time mTime; private Time mTime;
private String mS; private String mS;
private long mSubId; private int mSubId;
private int mPhoneId; private int mPhoneId;
private ServiceState mState; private ServiceState mState;
public void set(Time t, String s, long subId, int phoneId, ServiceState state) { public void set(Time t, String s, int subId, int phoneId, ServiceState state) {
mTime = t; mS = s; mSubId = subId; mPhoneId = phoneId; mState = state; mTime = t; mS = s; mSubId = subId; mPhoneId = phoneId; mState = state;
} }
@@ -1393,7 +1393,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
private LogSSC logSSC [] = new LogSSC[10]; private LogSSC logSSC [] = new LogSSC[10];
private int next = 0; private int next = 0;
private void logServiceStateChanged(String s, long subId, int phoneId, ServiceState state) { private void logServiceStateChanged(String s, int subId, int phoneId, ServiceState state) {
if (logSSC == null || logSSC.length == 0) { if (logSSC == null || logSSC.length == 0) {
return; return;
} }
@@ -1429,7 +1429,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
} }
} }
boolean subIdMatch(long rSubId, long subId) { boolean subIdMatch(int rSubId, int subId) {
if(rSubId == SubscriptionManager.DEFAULT_SUB_ID) { if(rSubId == SubscriptionManager.DEFAULT_SUB_ID) {
return (subId == mDefaultSubId); return (subId == mDefaultSubId);
} else { } else {

22
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -1570,7 +1570,7 @@ public class PhoneNumberUtils
* listed in the RIL / SIM, otherwise return false. * listed in the RIL / SIM, otherwise return false.
* @hide * @hide
*/ */
public static boolean isEmergencyNumber(long subId, String number) { public static boolean isEmergencyNumber(int subId, String number) {
// Return true only if the specified number *exactly* matches // Return true only if the specified number *exactly* matches
// one of the emergency numbers listed by the RIL / SIM. // one of the emergency numbers listed by the RIL / SIM.
return isEmergencyNumberInternal(subId, number, true /* useExactMatch */); return isEmergencyNumberInternal(subId, number, true /* useExactMatch */);
@@ -1620,7 +1620,7 @@ public class PhoneNumberUtils
* same digits as any of those emergency numbers. * same digits as any of those emergency numbers.
* @hide * @hide
*/ */
public static boolean isPotentialEmergencyNumber(long subId, String number) { public static boolean isPotentialEmergencyNumber(int subId, String number) {
// Check against the emergency numbers listed by the RIL / SIM, // Check against the emergency numbers listed by the RIL / SIM,
// and *don't* require an exact match. // and *don't* require an exact match.
return isEmergencyNumberInternal(subId, number, false /* useExactMatch */); return isEmergencyNumberInternal(subId, number, false /* useExactMatch */);
@@ -1669,7 +1669,7 @@ public class PhoneNumberUtils
* @return true if the number is in the list of emergency numbers * @return true if the number is in the list of emergency numbers
* listed in the RIL / sim, otherwise return false. * listed in the RIL / sim, otherwise return false.
*/ */
private static boolean isEmergencyNumberInternal(long subId, String number, private static boolean isEmergencyNumberInternal(int subId, String number,
boolean useExactMatch) { boolean useExactMatch) {
return isEmergencyNumberInternal(subId, number, null, useExactMatch); return isEmergencyNumberInternal(subId, number, null, useExactMatch);
} }
@@ -1698,7 +1698,7 @@ public class PhoneNumberUtils
* otherwise false * otherwise false
* @hide * @hide
*/ */
public static boolean isEmergencyNumber(long subId, String number, String defaultCountryIso) { public static boolean isEmergencyNumber(int subId, String number, String defaultCountryIso) {
return isEmergencyNumberInternal(subId, number, return isEmergencyNumberInternal(subId, number,
defaultCountryIso, defaultCountryIso,
true /* useExactMatch */); true /* useExactMatch */);
@@ -1750,7 +1750,7 @@ public class PhoneNumberUtils
* any of those emergency numbers. * any of those emergency numbers.
* @hide * @hide
*/ */
public static boolean isPotentialEmergencyNumber(long subId, String number, public static boolean isPotentialEmergencyNumber(int subId, String number,
String defaultCountryIso) { String defaultCountryIso) {
return isEmergencyNumberInternal(subId, number, return isEmergencyNumberInternal(subId, number,
defaultCountryIso, defaultCountryIso,
@@ -1794,7 +1794,7 @@ public class PhoneNumberUtils
* @return true if the number is an emergency number for the specified country. * @return true if the number is an emergency number for the specified country.
* @hide * @hide
*/ */
private static boolean isEmergencyNumberInternal(long subId, String number, private static boolean isEmergencyNumberInternal(int subId, String number,
String defaultCountryIso, String defaultCountryIso,
boolean useExactMatch) { boolean useExactMatch) {
// If the number passed in is null, just return false: // If the number passed in is null, just return false:
@@ -1911,7 +1911,7 @@ public class PhoneNumberUtils
* is currently in. * is currently in.
* @hide * @hide
*/ */
public static boolean isLocalEmergencyNumber(Context context, long subId, String number) { public static boolean isLocalEmergencyNumber(Context context, int subId, String number) {
return isLocalEmergencyNumberInternal(subId, number, return isLocalEmergencyNumberInternal(subId, number,
context, context,
true /* useExactMatch */); true /* useExactMatch */);
@@ -1965,7 +1965,7 @@ public class PhoneNumberUtils
* *
* @hide * @hide
*/ */
public static boolean isPotentialLocalEmergencyNumber(Context context, long subId, public static boolean isPotentialLocalEmergencyNumber(Context context, int subId,
String number) { String number) {
return isLocalEmergencyNumberInternal(subId, number, return isLocalEmergencyNumberInternal(subId, number,
context, context,
@@ -2014,7 +2014,7 @@ public class PhoneNumberUtils
* local country, based on the CountryDetector. * local country, based on the CountryDetector.
* @hide * @hide
*/ */
private static boolean isLocalEmergencyNumberInternal(long subId, String number, private static boolean isLocalEmergencyNumberInternal(int subId, String number,
Context context, Context context,
boolean useExactMatch) { boolean useExactMatch) {
String countryIso; String countryIso;
@@ -2057,7 +2057,7 @@ public class PhoneNumberUtils
* to read the VM number. * to read the VM number.
* @hide * @hide
*/ */
public static boolean isVoiceMailNumber(long subId, String number) { public static boolean isVoiceMailNumber(int subId, String number) {
String vmNumber; String vmNumber;
try { try {
@@ -2796,7 +2796,7 @@ public class PhoneNumberUtils
/** /**
* Returns Default voice subscription Id. * Returns Default voice subscription Id.
*/ */
private static long getDefaultVoiceSubId() { private static int getDefaultVoiceSubId() {
return SubscriptionManager.getDefaultVoiceSubId(); return SubscriptionManager.getDefaultVoiceSubId();
} }
//==== End of utility methods used only in compareStrictly() ===== //==== End of utility methods used only in compareStrictly() =====

8
telephony/java/android/telephony/PhoneStateListener.java
View File

@@ -227,7 +227,7 @@ public class PhoneStateListener {
* @hide * @hide
*/ */
/** @hide */ /** @hide */
protected long mSubId = SubscriptionManager.INVALID_SUB_ID; protected int mSubId = SubscriptionManager.INVALID_SUB_ID;
private final Handler mHandler; private final Handler mHandler;
@@ -252,10 +252,10 @@ public class PhoneStateListener {
/** /**
* Create a PhoneStateListener for the Phone using the specified subscription. * Create a PhoneStateListener for the Phone using the specified subscription.
* This class requires Looper.myLooper() not return null. To supply your * This class requires Looper.myLooper() not return null. To supply your
* own non-null Looper use PhoneStateListener(long subId, Looper looper) below. * own non-null Looper use PhoneStateListener(int subId, Looper looper) below.
* @hide * @hide
*/ */
public PhoneStateListener(long subId) { public PhoneStateListener(int subId) {
this(subId, Looper.myLooper()); this(subId, Looper.myLooper());
} }
@@ -264,7 +264,7 @@ public class PhoneStateListener {
* and non-null Looper. * and non-null Looper.
* @hide * @hide
*/ */
public PhoneStateListener(long subId, Looper looper) { public PhoneStateListener(int subId, Looper looper) {
if (DBG) log("ctor: subId=" + subId + " looper=" + looper); if (DBG) log("ctor: subId=" + subId + " looper=" + looper);
mSubId = subId; mSubId = subId;
mHandler = new Handler(looper) { mHandler = new Handler(looper) {

8
telephony/java/android/telephony/SubInfoRecord.java
View File

@@ -29,7 +29,7 @@ public class SubInfoRecord implements Parcelable {
* Subscription Identifier, this is a device unique number * Subscription Identifier, this is a device unique number
* and not an index into an array * and not an index into an array
*/ */
public long subId; public int subId;
/** The GID for a SIM that maybe associated with this subscription, empty if unknown */ /** The GID for a SIM that maybe associated with this subscription, empty if unknown */
public String iccId; public String iccId;
/** /**
@@ -91,7 +91,7 @@ public class SubInfoRecord implements Parcelable {
this.mnc = 0; this.mnc = 0;
} }
public SubInfoRecord(long subId, String iccId, int slotId, String displayName, int nameSource, public SubInfoRecord(int subId, String iccId, int slotId, String displayName, int nameSource,
int color, String number, int displayFormat, int roaming, int[] iconRes, int color, String number, int displayFormat, int roaming, int[] iconRes,
int mcc, int mnc) { int mcc, int mnc) {
this.subId = subId; this.subId = subId;
@@ -136,7 +136,7 @@ public class SubInfoRecord implements Parcelable {
public static final Parcelable.Creator<SubInfoRecord> CREATOR = new Parcelable.Creator<SubInfoRecord>() { public static final Parcelable.Creator<SubInfoRecord> CREATOR = new Parcelable.Creator<SubInfoRecord>() {
@Override @Override
public SubInfoRecord createFromParcel(Parcel source) { public SubInfoRecord createFromParcel(Parcel source) {
long subId = source.readLong(); int subId = source.readInt();
String iccId = source.readString(); String iccId = source.readString();
int slotId = source.readInt(); int slotId = source.readInt();
String displayName = source.readString(); String displayName = source.readString();
@@ -162,7 +162,7 @@ public class SubInfoRecord implements Parcelable {
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeLong(subId); dest.writeInt(subId);
dest.writeString(iccId); dest.writeString(iccId);
dest.writeInt(slotId); dest.writeInt(slotId);
dest.writeString(displayName); dest.writeString(displayName);

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

@@ -57,21 +57,21 @@ public class SubscriptionManager implements BaseColumns {
public static final int DEFAULT_SLOT_ID = Integer.MAX_VALUE; public static final int DEFAULT_SLOT_ID = Integer.MAX_VALUE;
/** Indicates the user should be asked which subscription to use. */ /** Indicates the user should be asked which subscription to use. */
public static final long ASK_USER_SUB_ID = -1001; public static final int ASK_USER_SUB_ID = -1001;
/** An invalid subscription identifier */ /** An invalid subscription identifier */
public static final long INVALID_SUB_ID = -1000; public static final int INVALID_SUB_ID = -1000;
/** Indicates the caller wants the default sub id. */ /** Indicates the caller wants the default sub id. */
public static final long DEFAULT_SUB_ID = Long.MAX_VALUE; public static final int DEFAULT_SUB_ID = Integer.MAX_VALUE;
/** Minimum possible subid that represents a subscription */ /** Minimum possible subid that represents a subscription */
/** @hide */ /** @hide */
public static final long MIN_SUB_ID_VALUE = 0; public static final int MIN_SUB_ID_VALUE = 0;
/** Maximum possible subid that represents a subscription */ /** Maximum possible subid that represents a subscription */
/** @hide */ /** @hide */
public static final long MAX_SUB_ID_VALUE = DEFAULT_SUB_ID - 1; public static final int MAX_SUB_ID_VALUE = DEFAULT_SUB_ID - 1;
/** @hide */ /** @hide */
@@ -265,7 +265,7 @@ public class SubscriptionManager implements BaseColumns {
* @param subId The unique SubInfoRecord index in database * @param subId The unique SubInfoRecord index in database
* @return SubInfoRecord, maybe null * @return SubInfoRecord, maybe null
*/ */
public static SubInfoRecord getSubInfoForSubscriber(long subId) { public static SubInfoRecord getSubInfoForSubscriber(int subId) {
if (!isValidSubId(subId)) { if (!isValidSubId(subId)) {
logd("[getSubInfoForSubscriberx]- invalid subId"); logd("[getSubInfoForSubscriberx]- invalid subId");
return null; return null;
@@ -475,7 +475,7 @@ public class SubscriptionManager implements BaseColumns {
* @return the number of records updated * @return the number of records updated
* @hide * @hide
*/ */
public static int setColor(int color, long subId) { public static int setColor(int color, int subId) {
if (VDBG) logd("[setColor]+ color:" + color + " subId:" + subId); if (VDBG) logd("[setColor]+ color:" + color + " subId:" + subId);
int size = sSimBackgroundDarkRes.length; int size = sSimBackgroundDarkRes.length;
if (!isValidSubId(subId) || color < 0 || color >= size) { if (!isValidSubId(subId) || color < 0 || color >= size) {
@@ -505,7 +505,7 @@ public class SubscriptionManager implements BaseColumns {
* @return the number of records updated * @return the number of records updated
* @hide * @hide
*/ */
public static int setDisplayName(String displayName, long subId) { public static int setDisplayName(String displayName, int subId) {
return setDisplayName(displayName, subId, NAME_SOURCE_UNDEFINDED); return setDisplayName(displayName, subId, NAME_SOURCE_UNDEFINDED);
} }
@@ -518,7 +518,7 @@ public class SubscriptionManager implements BaseColumns {
* @return the number of records updated or -1 if invalid subId * @return the number of records updated or -1 if invalid subId
* @hide * @hide
*/ */
public static int setDisplayName(String displayName, long subId, long nameSource) { public static int setDisplayName(String displayName, int subId, long nameSource) {
if (VDBG) { if (VDBG) {
logd("[setDisplayName]+ displayName:" + displayName + " subId:" + subId logd("[setDisplayName]+ displayName:" + displayName + " subId:" + subId
+ " nameSource:" + nameSource); + " nameSource:" + nameSource);
@@ -550,7 +550,7 @@ public class SubscriptionManager implements BaseColumns {
* @return the number of records updated * @return the number of records updated
* @hide * @hide
*/ */
public static int setDisplayNumber(String number, long subId) { public static int setDisplayNumber(String number, int subId) {
if (number == null || !isValidSubId(subId)) { if (number == null || !isValidSubId(subId)) {
logd("[setDisplayNumber]- fail"); logd("[setDisplayNumber]- fail");
return -1; return -1;
@@ -578,7 +578,7 @@ public class SubscriptionManager implements BaseColumns {
* @return the number of records updated * @return the number of records updated
* @hide * @hide
*/ */
public static int setDisplayNumberFormat(int format, long subId) { public static int setDisplayNumberFormat(int format, int subId) {
if (VDBG) logd("[setDisplayNumberFormat]+ format:" + format + " subId:" + subId); if (VDBG) logd("[setDisplayNumberFormat]+ format:" + format + " subId:" + subId);
if (format < 0 || !isValidSubId(subId)) { if (format < 0 || !isValidSubId(subId)) {
logd("[setDisplayNumberFormat]- fail, return -1"); logd("[setDisplayNumberFormat]- fail, return -1");
@@ -607,7 +607,7 @@ public class SubscriptionManager implements BaseColumns {
* @return the number of records updated * @return the number of records updated
* @hide * @hide
*/ */
public static int setDataRoaming(int roaming, long subId) { public static int setDataRoaming(int roaming, int subId) {
if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId); if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId);
if (roaming < 0 || !isValidSubId(subId)) { if (roaming < 0 || !isValidSubId(subId)) {
logd("[setDataRoaming]- fail"); logd("[setDataRoaming]- fail");
@@ -633,7 +633,7 @@ public class SubscriptionManager implements BaseColumns {
* @return slotId as a positive integer or a negative value if an error either * @return slotId as a positive integer or a negative value if an error either
* SIM_NOT_INSERTED or INVALID_SLOT_ID. * SIM_NOT_INSERTED or INVALID_SLOT_ID.
*/ */
public static int getSlotId(long subId) { public static int getSlotId(int subId) {
if (!isValidSubId(subId)) { if (!isValidSubId(subId)) {
logd("[getSlotId]- fail"); logd("[getSlotId]- fail");
} }
@@ -654,13 +654,13 @@ public class SubscriptionManager implements BaseColumns {
} }
/** @hide */ /** @hide */
public static long[] getSubId(int slotId) { public static int[] getSubId(int slotId) {
if (!isValidSlotId(slotId)) { if (!isValidSlotId(slotId)) {
logd("[getSubId]- fail"); logd("[getSubId]- fail");
return null; return null;
} }
long[] subId = null; int[] subId = null;
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
@@ -675,7 +675,7 @@ public class SubscriptionManager implements BaseColumns {
} }
/** @hide */ /** @hide */
public static int getPhoneId(long subId) { public static int getPhoneId(int subId) {
if (!isValidSubId(subId)) { if (!isValidSubId(subId)) {
logd("[getPhoneId]- fail"); logd("[getPhoneId]- fail");
return INVALID_PHONE_ID; return INVALID_PHONE_ID;
@@ -732,8 +732,8 @@ public class SubscriptionManager implements BaseColumns {
* getDefaultDataSubId(). * getDefaultDataSubId().
* @hide * @hide
*/ */
public static long getDefaultSubId() { public static int getDefaultSubId() {
long subId = INVALID_SUB_ID; int subId = INVALID_SUB_ID;
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
@@ -749,8 +749,8 @@ public class SubscriptionManager implements BaseColumns {
} }
/** @hide */ /** @hide */
public static long getDefaultVoiceSubId() { public static int getDefaultVoiceSubId() {
long subId = INVALID_SUB_ID; int subId = INVALID_SUB_ID;
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
@@ -766,7 +766,7 @@ public class SubscriptionManager implements BaseColumns {
} }
/** @hide */ /** @hide */
public static void setDefaultVoiceSubId(long subId) { public static void setDefaultVoiceSubId(int subId) {
if (VDBG) logd("setDefaultVoiceSubId sub id = " + subId); if (VDBG) logd("setDefaultVoiceSubId sub id = " + subId);
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
@@ -791,8 +791,8 @@ public class SubscriptionManager implements BaseColumns {
/** /**
* @return subId of the DefaultSms subscription or the value INVALID_SUB_ID if an error. * @return subId of the DefaultSms subscription or the value INVALID_SUB_ID if an error.
*/ */
public static long getDefaultSmsSubId() { public static int getDefaultSmsSubId() {
long subId = INVALID_SUB_ID; int subId = INVALID_SUB_ID;
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
@@ -808,7 +808,7 @@ public class SubscriptionManager implements BaseColumns {
} }
/** @hide */ /** @hide */
public static void setDefaultSmsSubId(long subId) { public static void setDefaultSmsSubId(int subId) {
if (VDBG) logd("setDefaultSmsSubId sub id = " + subId); if (VDBG) logd("setDefaultSmsSubId sub id = " + subId);
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
@@ -831,8 +831,8 @@ public class SubscriptionManager implements BaseColumns {
} }
/** @hide */ /** @hide */
public static long getDefaultDataSubId() { public static int getDefaultDataSubId() {
long subId = INVALID_SUB_ID; int subId = INVALID_SUB_ID;
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
@@ -848,7 +848,7 @@ public class SubscriptionManager implements BaseColumns {
} }
/** @hide */ /** @hide */
public static void setDefaultDataSubId(long subId) { public static void setDefaultDataSubId(int subId) {
if (VDBG) logd("setDataSubscription sub id = " + subId); if (VDBG) logd("setDataSubscription sub id = " + subId);
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
@@ -919,7 +919,7 @@ public class SubscriptionManager implements BaseColumns {
/** /**
* @return true if a valid subId else false * @return true if a valid subId else false
*/ */
public static boolean isValidSubId(long subId) { public static boolean isValidSubId(int subId) {
return subId > INVALID_SUB_ID ; return subId > INVALID_SUB_ID ;
} }
@@ -928,7 +928,7 @@ public class SubscriptionManager implements BaseColumns {
* usable subId means its neither a INVALID_SUB_ID nor a DEFAUL_SUB_ID. * usable subId means its neither a INVALID_SUB_ID nor a DEFAUL_SUB_ID.
* @hide * @hide
*/ */
public static boolean isUsableSubIdValue(long subId) { public static boolean isUsableSubIdValue(int subId) {
return subId >= MIN_SUB_ID_VALUE && subId <= MAX_SUB_ID_VALUE; return subId >= MIN_SUB_ID_VALUE && subId <= MAX_SUB_ID_VALUE;
} }
@@ -952,7 +952,7 @@ public class SubscriptionManager implements BaseColumns {
/** @hide */ /** @hide */
public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) { public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) {
long[] subIds = SubscriptionManager.getSubId(phoneId); int[] subIds = SubscriptionManager.getSubId(phoneId);
if (subIds != null && subIds.length > 0) { if (subIds != null && subIds.length > 0) {
putPhoneIdAndSubIdExtra(intent, phoneId, subIds[0]); putPhoneIdAndSubIdExtra(intent, phoneId, subIds[0]);
} else { } else {
@@ -961,7 +961,7 @@ public class SubscriptionManager implements BaseColumns {
} }
/** @hide */ /** @hide */
public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId, long subId) { public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId, int subId) {
if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId); if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId);
intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId); intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
intent.putExtra(PhoneConstants.PHONE_KEY, phoneId); intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);
@@ -975,8 +975,8 @@ public class SubscriptionManager implements BaseColumns {
* is never null but the length maybe 0. * is never null but the length maybe 0.
* @hide * @hide
*/ */
public static long[] getActiveSubIdList() { public static int[] getActiveSubIdList() {
long[] subId = null; int[] subId = null;
try { try {
ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
@@ -988,7 +988,7 @@ public class SubscriptionManager implements BaseColumns {
} }
if (subId == null) { if (subId == null) {
subId = new long[0]; subId = new int[0];
} }
return subId; return subId;

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

@@ -588,7 +588,7 @@ public class TelephonyManager {
/** {@hide} */ /** {@hide} */
public String getDeviceSoftwareVersion(int slotId) { public String getDeviceSoftwareVersion(int slotId) {
// FIXME methods taking slot id should not use subscription, instead us Uicc directly // FIXME methods taking slot id should not use subscription, instead us Uicc directly
long[] subId = SubscriptionManager.getSubId(slotId); int[] subId = SubscriptionManager.getSubId(slotId);
if (subId == null || subId.length == 0) { if (subId == null || subId.length == 0) {
return null; return null;
} }
@@ -624,7 +624,7 @@ public class TelephonyManager {
/** {@hide} */ /** {@hide} */
public String getDeviceId(int slotId) { public String getDeviceId(int slotId) {
// FIXME methods taking slot id should not use subscription, instead us Uicc directly // FIXME methods taking slot id should not use subscription, instead us Uicc directly
long[] subId = SubscriptionManager.getSubId(slotId); int[] subId = SubscriptionManager.getSubId(slotId);
if (subId == null || subId.length == 0) { if (subId == null || subId.length == 0) {
return null; return null;
} }
@@ -658,7 +658,7 @@ public class TelephonyManager {
*/ */
/** {@hide} */ /** {@hide} */
public String getImei(int slotId) { public String getImei(int slotId) {
long[] subId = SubscriptionManager.getSubId(slotId); int[] subId = SubscriptionManager.getSubId(slotId);
try { try {
return getSubscriberInfo().getImeiForSubscriber(subId[0]); return getSubscriberInfo().getImeiForSubscriber(subId[0]);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -684,7 +684,7 @@ public class TelephonyManager {
*/ */
/** {@hide}*/ /** {@hide}*/
public String getNai(int slotId) { public String getNai(int slotId) {
long[] subId = SubscriptionManager.getSubId(slotId); int[] subId = SubscriptionManager.getSubId(slotId);
try { try {
return getSubscriberInfo().getNaiForSubscriber(subId[0]); return getSubscriberInfo().getNaiForSubscriber(subId[0]);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -748,7 +748,7 @@ public class TelephonyManager {
* @param subId for which the location updates are enabled * @param subId for which the location updates are enabled
*/ */
/** @hide */ /** @hide */
public void enableLocationUpdates(long subId) { public void enableLocationUpdates(int subId) {
try { try {
getITelephony().enableLocationUpdatesForSubscriber(subId); getITelephony().enableLocationUpdatesForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -770,7 +770,7 @@ public class TelephonyManager {
} }
/** @hide */ /** @hide */
public void disableLocationUpdates(long subId) { public void disableLocationUpdates(int subId) {
try { try {
getITelephony().disableLocationUpdatesForSubscriber(subId); getITelephony().disableLocationUpdatesForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -835,7 +835,7 @@ public class TelephonyManager {
*/ */
/** {@hide} */ /** {@hide} */
@SystemApi @SystemApi
public int getCurrentPhoneType(long subId) { public int getCurrentPhoneType(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
try{ try{
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
@@ -1047,7 +1047,7 @@ public class TelephonyManager {
* @param subId * @param subId
*/ */
/** {@hide} */ /** {@hide} */
public String getNetworkOperatorName(long subId) { public String getNetworkOperatorName(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ALPHA, ""); return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ALPHA, "");
} }
@@ -1074,7 +1074,7 @@ public class TelephonyManager {
* @param subId * @param subId
*/ */
/** {@hide} */ /** {@hide} */
public String getNetworkOperator(long subId) { public String getNetworkOperator(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_NUMERIC, ""); return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_NUMERIC, "");
} }
@@ -1098,7 +1098,7 @@ public class TelephonyManager {
* @param subId * @param subId
*/ */
/** {@hide} */ /** {@hide} */
public boolean isNetworkRoaming(long subId) { public boolean isNetworkRoaming(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return Boolean.parseBoolean(getTelephonyProperty(phoneId, return Boolean.parseBoolean(getTelephonyProperty(phoneId,
TelephonyProperties.PROPERTY_OPERATOR_ISROAMING, null)); TelephonyProperties.PROPERTY_OPERATOR_ISROAMING, null));
@@ -1127,7 +1127,7 @@ public class TelephonyManager {
* @param subId for which Network CountryIso is returned * @param subId for which Network CountryIso is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getNetworkCountryIso(long subId) { public String getNetworkCountryIso(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, ""); return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");
} }
@@ -1199,7 +1199,7 @@ public class TelephonyManager {
* @see #NETWORK_TYPE_HSPAP * @see #NETWORK_TYPE_HSPAP
*/ */
/** {@hide} */ /** {@hide} */
public int getNetworkType(long subId) { public int getNetworkType(int subId) {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
@@ -1253,7 +1253,7 @@ public class TelephonyManager {
* @param subId for which network type is returned * @param subId for which network type is returned
*/ */
/** {@hide} */ /** {@hide} */
public int getDataNetworkType(long subId) { public int getDataNetworkType(int subId) {
try{ try{
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
@@ -1285,7 +1285,7 @@ public class TelephonyManager {
* *
*/ */
/** {@hide} */ /** {@hide} */
public int getVoiceNetworkType(long subId) { public int getVoiceNetworkType(int subId) {
try{ try{
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
@@ -1442,7 +1442,7 @@ public class TelephonyManager {
*/ */
/** {@hide} */ /** {@hide} */
// FIXME Input argument slotId should be of type int // FIXME Input argument slotId should be of type int
public boolean hasIccCard(long slotId) { public boolean hasIccCard(int slotId) {
try { try {
return getITelephony().hasIccCardUsingSlotId(slotId); return getITelephony().hasIccCardUsingSlotId(slotId);
@@ -1487,7 +1487,7 @@ public class TelephonyManager {
/** {@hide} */ /** {@hide} */
// FIXME the argument to pass is subId ?? // FIXME the argument to pass is subId ??
public int getSimState(int slotId) { public int getSimState(int slotId) {
long[] subId = SubscriptionManager.getSubId(slotId); int[] subId = SubscriptionManager.getSubId(slotId);
if (subId == null || subId.length == 0) { if (subId == null || subId.length == 0) {
return SIM_STATE_ABSENT; return SIM_STATE_ABSENT;
} }
@@ -1527,7 +1527,7 @@ public class TelephonyManager {
* @see #getSimState * @see #getSimState
*/ */
public String getSimOperator() { public String getSimOperator() {
long subId = SubscriptionManager.getDefaultDataSubId(); int subId = SubscriptionManager.getDefaultDataSubId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) { if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultSmsSubId(); subId = SubscriptionManager.getDefaultSmsSubId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) { if (!SubscriptionManager.isUsableSubIdValue(subId)) {
@@ -1552,7 +1552,7 @@ public class TelephonyManager {
* @param subId for which SimOperator is returned * @param subId for which SimOperator is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getSimOperator(long subId) { public String getSimOperator(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
String operator = getTelephonyProperty(phoneId, String operator = getTelephonyProperty(phoneId,
TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, ""); TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "");
@@ -1581,7 +1581,7 @@ public class TelephonyManager {
* @param subId for which SimOperatorName is returned * @param subId for which SimOperatorName is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getSimOperatorName(long subId) { public String getSimOperatorName(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, ""); return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, "");
} }
@@ -1599,7 +1599,7 @@ public class TelephonyManager {
* @param subId for which SimCountryIso is returned * @param subId for which SimCountryIso is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getSimCountryIso(long subId) { public String getSimCountryIso(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY, return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY,
""); "");
@@ -1625,7 +1625,7 @@ public class TelephonyManager {
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/ */
/** {@hide} */ /** {@hide} */
public String getSimSerialNumber(long subId) { public String getSimSerialNumber(int subId) {
try { try {
return getSubscriberInfo().getIccSerialNumberForSubscriber(subId); return getSubscriberInfo().getIccSerialNumberForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -1661,7 +1661,7 @@ public class TelephonyManager {
* *
*/ */
/** {@hide} */ /** {@hide} */
public int getLteOnCdmaMode(long subId) { public int getLteOnCdmaMode(int subId) {
try { try {
return getITelephony().getLteOnCdmaModeForSubscriber(subId); return getITelephony().getLteOnCdmaModeForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -1701,7 +1701,7 @@ public class TelephonyManager {
* @param subId whose subscriber id is returned * @param subId whose subscriber id is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getSubscriberId(long subId) { public String getSubscriberId(int subId) {
try { try {
return getSubscriberInfo().getSubscriberIdForSubscriber(subId); return getSubscriberInfo().getSubscriberIdForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -1740,7 +1740,7 @@ public class TelephonyManager {
* @param subscription whose subscriber id is returned * @param subscription whose subscriber id is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getGroupIdLevel1(long subId) { public String getGroupIdLevel1(int subId) {
try { try {
return getSubscriberInfo().getGroupIdLevel1ForSubscriber(subId); return getSubscriberInfo().getGroupIdLevel1ForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -1772,7 +1772,7 @@ public class TelephonyManager {
* @param subId whose phone number for line 1 is returned * @param subId whose phone number for line 1 is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getLine1NumberForSubscriber(long subId) { public String getLine1NumberForSubscriber(int subId) {
String number = null; String number = null;
try { try {
number = getITelephony().getLine1NumberForDisplay(subId); number = getITelephony().getLine1NumberForDisplay(subId);
@@ -1824,7 +1824,7 @@ public class TelephonyManager {
* @param number The dialing number * @param number The dialing number
* @hide * @hide
*/ */
public void setLine1NumberForDisplayForSubscriber(long subId, String alphaTag, String number) { public void setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) {
try { try {
getITelephony().setLine1NumberForDisplayForSubscriber(subId, alphaTag, number); getITelephony().setLine1NumberForDisplayForSubscriber(subId, alphaTag, number);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -1856,7 +1856,7 @@ public class TelephonyManager {
* nobody seems to call this. * nobody seems to call this.
*/ */
/** {@hide} */ /** {@hide} */
public String getLine1AlphaTagForSubscriber(long subId) { public String getLine1AlphaTagForSubscriber(int subId) {
String alphaTag = null; String alphaTag = null;
try { try {
alphaTag = getITelephony().getLine1AlphaTagForDisplay(subId); alphaTag = getITelephony().getLine1AlphaTagForDisplay(subId);
@@ -1899,7 +1899,7 @@ public class TelephonyManager {
* @param subId for which msisdn is returned * @param subId for which msisdn is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getMsisdn(long subId) { public String getMsisdn(int subId) {
try { try {
return getSubscriberInfo().getMsisdnForSubscriber(subId); return getSubscriberInfo().getMsisdnForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -1929,7 +1929,7 @@ public class TelephonyManager {
* @param subId whose voice mail number is returned * @param subId whose voice mail number is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getVoiceMailNumber(long subId) { public String getVoiceMailNumber(int subId) {
try { try {
return getSubscriberInfo().getVoiceMailNumberForSubscriber(subId); return getSubscriberInfo().getVoiceMailNumberForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -1961,7 +1961,7 @@ public class TelephonyManager {
* @param subId * @param subId
*/ */
/** {@hide} */ /** {@hide} */
public String getCompleteVoiceMailNumber(long subId) { public String getCompleteVoiceMailNumber(int subId) {
try { try {
return getSubscriberInfo().getCompleteVoiceMailNumberForSubscriber(subId); return getSubscriberInfo().getCompleteVoiceMailNumberForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -1991,7 +1991,7 @@ public class TelephonyManager {
* @param subId whose voice message count is returned * @param subId whose voice message count is returned
*/ */
/** {@hide} */ /** {@hide} */
public int getVoiceMessageCount(long subId) { public int getVoiceMessageCount(int subId) {
try { try {
return getITelephony().getVoiceMessageCountForSubscriber(subId); return getITelephony().getVoiceMessageCountForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -2023,7 +2023,7 @@ public class TelephonyManager {
* voice mail number is returned * voice mail number is returned
*/ */
/** {@hide} */ /** {@hide} */
public String getVoiceMailAlphaTag(long subId) { public String getVoiceMailAlphaTag(int subId) {
try { try {
return getSubscriberInfo().getVoiceMailAlphaTagForSubscriber(subId); return getSubscriberInfo().getVoiceMailAlphaTagForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -2120,7 +2120,7 @@ public class TelephonyManager {
* @param subId whose call state is returned * @param subId whose call state is returned
*/ */
/** {@hide} */ /** {@hide} */
public int getCallState(long subId) { public int getCallState(int subId) {
try { try {
return getITelephony().getCallStateForSubscriber(subId); return getITelephony().getCallStateForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -2271,7 +2271,7 @@ public class TelephonyManager {
* Returns the CDMA ERI icon index to display for a subscription * Returns the CDMA ERI icon index to display for a subscription
*/ */
/** {@hide} */ /** {@hide} */
public int getCdmaEriIconIndex(long subId) { public int getCdmaEriIconIndex(int subId) {
try { try {
return getITelephony().getCdmaEriIconIndexForSubscriber(subId); return getITelephony().getCdmaEriIconIndexForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -2299,7 +2299,7 @@ public class TelephonyManager {
* 1 - FLASHING * 1 - FLASHING
*/ */
/** {@hide} */ /** {@hide} */
public int getCdmaEriIconMode(long subId) { public int getCdmaEriIconMode(int subId) {
try { try {
return getITelephony().getCdmaEriIconModeForSubscriber(subId); return getITelephony().getCdmaEriIconModeForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -2324,7 +2324,7 @@ public class TelephonyManager {
* *
*/ */
/** {@hide} */ /** {@hide} */
public String getCdmaEriText(long subId) { public String getCdmaEriText(int subId) {
try { try {
return getITelephony().getCdmaEriTextForSubscriber(subId); return getITelephony().getCdmaEriTextForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -2696,7 +2696,7 @@ public class TelephonyManager {
/** /**
* Returns Default subscription. * Returns Default subscription.
*/ */
private static long getDefaultSubscription() { private static int getDefaultSubscription() {
return SubscriptionManager.getDefaultSubId(); return SubscriptionManager.getDefaultSubId();
} }
@@ -2938,7 +2938,7 @@ public class TelephonyManager {
* @return the response of SIM Authentication, or null if not available * @return the response of SIM Authentication, or null if not available
* @hide * @hide
*/ */
public String getIccSimChallengeResponse(long subId, int appType, String data) { public String getIccSimChallengeResponse(int subId, int appType, String data) {
try { try {
return getSubscriberInfo().getIccSimChallengeResponse(subId, appType, data); return getSubscriberInfo().getIccSimChallengeResponse(subId, appType, data);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -3119,7 +3119,7 @@ public class TelephonyManager {
/** @hide */ /** @hide */
@SystemApi @SystemApi
public String getCdmaMdn(long subId) { public String getCdmaMdn(int subId) {
try { try {
return getITelephony().getCdmaMdn(subId); return getITelephony().getCdmaMdn(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -3137,7 +3137,7 @@ public class TelephonyManager {
/** @hide */ /** @hide */
@SystemApi @SystemApi
public String getCdmaMin(long subId) { public String getCdmaMin(int subId) {
try { try {
return getITelephony().getCdmaMin(subId); return getITelephony().getCdmaMin(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -3468,7 +3468,7 @@ public class TelephonyManager {
* @param enable true means enabling the simplified UI. * @param enable true means enabling the simplified UI.
* @hide * @hide
*/ */
public void enableSimplifiedNetworkSettingsForSubscriber(long subId, boolean enable) { public void enableSimplifiedNetworkSettingsForSubscriber(int subId, boolean enable) {
try { try {
getITelephony().enableSimplifiedNetworkSettingsForSubscriber(subId, enable); getITelephony().enableSimplifiedNetworkSettingsForSubscriber(subId, enable);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -3501,7 +3501,7 @@ public class TelephonyManager {
* @return true if the simplified UI is enabled. * @return true if the simplified UI is enabled.
* @hide * @hide
*/ */
public boolean getSimplifiedNetworkSettingsEnabledForSubscriber(long subId) { public boolean getSimplifiedNetworkSettingsEnabledForSubscriber(int subId) {
try { try {
return getITelephony().getSimplifiedNetworkSettingsEnabledForSubscriber(subId); return getITelephony().getSimplifiedNetworkSettingsEnabledForSubscriber(subId);
} catch (RemoteException ex) { } catch (RemoteException ex) {

8
telephony/java/com/android/internal/telephony/CallerInfo.java
View File

@@ -301,7 +301,7 @@ public class CallerInfo {
public static CallerInfo getCallerInfo(Context context, String number) { public static CallerInfo getCallerInfo(Context context, String number) {
if (VDBG) Rlog.v(TAG, "getCallerInfo() based on number..."); if (VDBG) Rlog.v(TAG, "getCallerInfo() based on number...");
long subId = SubscriptionManager.getDefaultSubId(); int subId = SubscriptionManager.getDefaultSubId();
return getCallerInfo(context, number, subId); return getCallerInfo(context, number, subId);
} }
@@ -316,7 +316,7 @@ public class CallerInfo {
* a matching number is not found, then a generic caller info is returned, * a matching number is not found, then a generic caller info is returned,
* with all relevant fields empty or null. * with all relevant fields empty or null.
*/ */
public static CallerInfo getCallerInfo(Context context, String number, long subId) { public static CallerInfo getCallerInfo(Context context, String number, int subId) {
if (TextUtils.isEmpty(number)) { if (TextUtils.isEmpty(number)) {
return null; return null;
@@ -418,12 +418,12 @@ public class CallerInfo {
// string in the phone number field. // string in the phone number field.
/* package */ CallerInfo markAsVoiceMail() { /* package */ CallerInfo markAsVoiceMail() {
long subId = SubscriptionManager.getDefaultSubId(); int subId = SubscriptionManager.getDefaultSubId();
return markAsVoiceMail(subId); return markAsVoiceMail(subId);
} }
/* package */ CallerInfo markAsVoiceMail(long subId) { /* package */ CallerInfo markAsVoiceMail(int subId) {
mIsVoiceMail = true; mIsVoiceMail = true;
try { try {

6
telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
View File

@@ -81,7 +81,7 @@ public class CallerInfoAsyncQuery {
public int event; public int event;
public String number; public String number;
public long subId; public int subId;
} }
@@ -388,7 +388,7 @@ public class CallerInfoAsyncQuery {
public static CallerInfoAsyncQuery startQuery(int token, Context context, String number, public static CallerInfoAsyncQuery startQuery(int token, Context context, String number,
OnQueryCompleteListener listener, Object cookie) { OnQueryCompleteListener listener, Object cookie) {
long subId = SubscriptionManager.getDefaultSubId(); int subId = SubscriptionManager.getDefaultSubId();
return startQuery(token, context, number, listener, cookie, subId); return startQuery(token, context, number, listener, cookie, subId);
} }
@@ -404,7 +404,7 @@ public class CallerInfoAsyncQuery {
* the phone type of the incoming connection. * the phone type of the incoming connection.
*/ */
public static CallerInfoAsyncQuery startQuery(int token, Context context, String number, public static CallerInfoAsyncQuery startQuery(int token, Context context, String number,
OnQueryCompleteListener listener, Object cookie, long subId) { OnQueryCompleteListener listener, Object cookie, int subId) {
if (DBG) { if (DBG) {
Rlog.d(LOG_TAG, "##### CallerInfoAsyncQuery startQuery()... #####"); Rlog.d(LOG_TAG, "##### CallerInfoAsyncQuery startQuery()... #####");

8
telephony/java/com/android/internal/telephony/DcParamObject.java
View File

@@ -21,9 +21,9 @@ import android.os.Parcel;
public class DcParamObject implements Parcelable { public class DcParamObject implements Parcelable {
private long mSubId; private int mSubId;
public DcParamObject(long subId) { public DcParamObject(int subId) {
mSubId = subId; mSubId = subId;
} }
@@ -40,7 +40,7 @@ public class DcParamObject implements Parcelable {
} }
private void readFromParcel(Parcel in) { private void readFromParcel(Parcel in) {
mSubId = in.readLong(); mSubId = in.readInt();
} }
public static final Parcelable.Creator<DcParamObject> CREATOR = new Parcelable.Creator<DcParamObject>() { public static final Parcelable.Creator<DcParamObject> CREATOR = new Parcelable.Creator<DcParamObject>() {
@@ -52,7 +52,7 @@ public class DcParamObject implements Parcelable {
} }
}; };
public long getSubId() { public int getSubId() {
return mSubId; return mSubId;
} }
} }

8
telephony/java/com/android/internal/telephony/IMms.aidl
View File

@@ -39,7 +39,7 @@ interface IMms {
* @param sentIntent if not NULL this <code>PendingIntent</code> is * @param sentIntent if not NULL this <code>PendingIntent</code> is
* broadcast when the message is successfully sent, or failed * broadcast when the message is successfully sent, or failed
*/ */
void sendMessage(long subId, String callingPkg, in Uri contentUri, void sendMessage(int subId, String callingPkg, in Uri contentUri,
String locationUrl, in Bundle configOverrides, in PendingIntent sentIntent); String locationUrl, in Bundle configOverrides, in PendingIntent sentIntent);
/** /**
@@ -56,7 +56,7 @@ interface IMms {
* @param downloadedIntent if not NULL this <code>PendingIntent</code> is * @param downloadedIntent if not NULL this <code>PendingIntent</code> is
* broadcast when the message is downloaded, or the download is failed * broadcast when the message is downloaded, or the download is failed
*/ */
void downloadMessage(long subId, String callingPkg, String locationUrl, void downloadMessage(int subId, String callingPkg, String locationUrl,
in Uri contentUri, in Bundle configOverrides, in Uri contentUri, in Bundle configOverrides,
in PendingIntent downloadedIntent); in PendingIntent downloadedIntent);
@@ -99,7 +99,7 @@ interface IMms {
* *
* @param subId the SIM id * @param subId the SIM id
*/ */
Bundle getCarrierConfigValues(long subId); Bundle getCarrierConfigValues(int subId);
/** /**
* Import a text message into system's SMS store * Import a text message into system's SMS store
@@ -204,7 +204,7 @@ interface IMms {
* @param sentIntent if not NULL this <code>PendingIntent</code> is * @param sentIntent if not NULL this <code>PendingIntent</code> is
* broadcast when the message is successfully sent, or failed * broadcast when the message is successfully sent, or failed
*/ */
void sendStoredMessage(long subId, String callingPkg, in Uri messageUri, void sendStoredMessage(int subId, String callingPkg, in Uri messageUri,
in Bundle configOverrides, in PendingIntent sentIntent); in Bundle configOverrides, in PendingIntent sentIntent);
/** /**

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

@@ -30,18 +30,18 @@ interface IPhoneSubInfo {
/** /**
* Retrieves the unique Network Access ID * Retrieves the unique Network Access ID
*/ */
String getNaiForSubscriber(long subId); String getNaiForSubscriber(int subId);
/** /**
* Retrieves the unique device ID of a subId for the device, e.g., IMEI * Retrieves the unique device ID of a subId for the device, e.g., IMEI
* for GSM phones. * for GSM phones.
*/ */
String getDeviceIdForSubscriber(long subId); String getDeviceIdForSubscriber(int subId);
/** /**
* Retrieves the IMEI. * Retrieves the IMEI.
*/ */
String getImeiForSubscriber(long subId); String getImeiForSubscriber(int subId);
/** /**
* Retrieves the software version number for the device, e.g., IMEI/SV * Retrieves the software version number for the device, e.g., IMEI/SV
@@ -53,7 +53,7 @@ interface IPhoneSubInfo {
* Retrieves the software version number of a subId for the device, e.g., IMEI/SV * Retrieves the software version number of a subId for the device, e.g., IMEI/SV
* for GSM phones. * for GSM phones.
*/ */
String getDeviceSvnUsingSubId(long subId); String getDeviceSvnUsingSubId(int subId);
/** /**
* Retrieves the unique sbuscriber ID, e.g., IMSI for GSM phones. * Retrieves the unique sbuscriber ID, e.g., IMSI for GSM phones.
@@ -63,7 +63,7 @@ interface IPhoneSubInfo {
/** /**
* Retrieves the unique subscriber ID of a given subId, e.g., IMSI for GSM phones. * Retrieves the unique subscriber ID of a given subId, e.g., IMSI for GSM phones.
*/ */
String getSubscriberIdForSubscriber(long subId); String getSubscriberIdForSubscriber(int subId);
/** /**
* Retrieves the Group Identifier Level1 for GSM phones. * Retrieves the Group Identifier Level1 for GSM phones.
@@ -73,7 +73,7 @@ interface IPhoneSubInfo {
/** /**
* Retrieves the Group Identifier Level1 for GSM phones of a subId. * Retrieves the Group Identifier Level1 for GSM phones of a subId.
*/ */
String getGroupIdLevel1ForSubscriber(long subId); String getGroupIdLevel1ForSubscriber(int subId);
/** /**
* Retrieves the serial number of the ICC, if applicable. * Retrieves the serial number of the ICC, if applicable.
@@ -83,7 +83,7 @@ interface IPhoneSubInfo {
/** /**
* Retrieves the serial number of a given subId. * Retrieves the serial number of a given subId.
*/ */
String getIccSerialNumberForSubscriber(long subId); String getIccSerialNumberForSubscriber(int subId);
/** /**
* Retrieves the phone number string for line 1. * Retrieves the phone number string for line 1.
@@ -93,7 +93,7 @@ interface IPhoneSubInfo {
/** /**
* Retrieves the phone number string for line 1 of a subcription. * Retrieves the phone number string for line 1 of a subcription.
*/ */
String getLine1NumberForSubscriber(long subId); String getLine1NumberForSubscriber(int subId);
/** /**
@@ -104,7 +104,7 @@ interface IPhoneSubInfo {
/** /**
* Retrieves the alpha identifier for line 1 of a subId. * Retrieves the alpha identifier for line 1 of a subId.
*/ */
String getLine1AlphaTagForSubscriber(long subId); String getLine1AlphaTagForSubscriber(int subId);
/** /**
@@ -115,7 +115,7 @@ interface IPhoneSubInfo {
/** /**
* Retrieves the Msisdn of a subId. * Retrieves the Msisdn of a subId.
*/ */
String getMsisdnForSubscriber(long subId); String getMsisdnForSubscriber(int subId);
/** /**
* Retrieves the voice mail number. * Retrieves the voice mail number.
@@ -125,7 +125,7 @@ interface IPhoneSubInfo {
/** /**
* Retrieves the voice mail number of a given subId. * Retrieves the voice mail number of a given subId.
*/ */
String getVoiceMailNumberForSubscriber(long subId); String getVoiceMailNumberForSubscriber(int subId);
/** /**
* Retrieves the complete voice mail number. * Retrieves the complete voice mail number.
@@ -135,7 +135,7 @@ interface IPhoneSubInfo {
/** /**
* Retrieves the complete voice mail number for particular subId * Retrieves the complete voice mail number for particular subId
*/ */
String getCompleteVoiceMailNumberForSubscriber(long subId); String getCompleteVoiceMailNumberForSubscriber(int subId);
/** /**
* Retrieves the alpha identifier associated with the voice mail number. * Retrieves the alpha identifier associated with the voice mail number.
@@ -146,7 +146,7 @@ interface IPhoneSubInfo {
* Retrieves the alpha identifier associated with the voice mail number * Retrieves the alpha identifier associated with the voice mail number
* of a subId. * of a subId.
*/ */
String getVoiceMailAlphaTagForSubscriber(long subId); String getVoiceMailAlphaTagForSubscriber(int subId);
/** /**
* Returns the IMS private user identity (IMPI) that was loaded from the ISIM. * Returns the IMS private user identity (IMPI) that was loaded from the ISIM.
@@ -199,5 +199,5 @@ interface IPhoneSubInfo {
* @param data authentication challenge data * @param data authentication challenge data
* @return challenge response * @return challenge response
*/ */
String getIccSimChallengeResponse(long subId, int appType, String data); String getIccSimChallengeResponse(int subId, int appType, String data);
} }

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

@@ -47,7 +47,7 @@ interface ISms {
* @param subId the subId id. * @param subId the subId id.
* @return list of SmsRawData of all sms on ICC * @return list of SmsRawData of all sms on ICC
*/ */
List<SmsRawData> getAllMessagesFromIccEfForSubscriber(in long subId, String callingPkg); List<SmsRawData> getAllMessagesFromIccEfForSubscriber(in int subId, String callingPkg);
/** /**
* Update the specified message on the ICC. * Update the specified message on the ICC.
@@ -75,7 +75,7 @@ interface ISms {
* @return success or not * @return success or not
* *
*/ */
boolean updateMessageOnIccEfForSubscriber(in long subId, String callingPkg, boolean updateMessageOnIccEfForSubscriber(in int subId, String callingPkg,
int messageIndex, int newStatus, in byte[] pdu); int messageIndex, int newStatus, in byte[] pdu);
/** /**
@@ -99,7 +99,7 @@ interface ISms {
* @return success or not * @return success or not
* *
*/ */
boolean copyMessageToIccEfForSubscriber(in long subId, String callingPkg, int status, boolean copyMessageToIccEfForSubscriber(in int subId, String callingPkg, int status,
in byte[] pdu, in byte[] smsc); in byte[] pdu, in byte[] smsc);
/** /**
@@ -152,7 +152,7 @@ interface ISms {
* raw pdu of the status report is in the extended data ("pdu"). * raw pdu of the status report is in the extended data ("pdu").
* @param subId the subId id. * @param subId the subId id.
*/ */
void sendDataForSubscriber(long subId, String callingPkg, in String destAddr, void sendDataForSubscriber(int subId, String callingPkg, in String destAddr,
in String scAddr, in int destPort, in byte[] data, in PendingIntent sentIntent, in String scAddr, in int destPort, in byte[] data, in PendingIntent sentIntent,
in PendingIntent deliveryIntent); in PendingIntent deliveryIntent);
@@ -206,7 +206,7 @@ interface ISms {
* raw pdu of the status report is in the extended data ("pdu"). * raw pdu of the status report is in the extended data ("pdu").
* @param subId the subId on which the SMS has to be sent. * @param subId the subId on which the SMS has to be sent.
*/ */
void sendTextForSubscriber(in long subId, String callingPkg, in String destAddr, void sendTextForSubscriber(in int subId, String callingPkg, in String destAddr,
in String scAddr, in String text, in PendingIntent sentIntent, in String scAddr, in String text, in PendingIntent sentIntent,
in PendingIntent deliveryIntent); in PendingIntent deliveryIntent);
@@ -283,7 +283,7 @@ interface ISms {
* extended data ("pdu"). * extended data ("pdu").
* @param subId the subId on which the SMS has to be sent. * @param subId the subId on which the SMS has to be sent.
*/ */
void sendMultipartTextForSubscriber(in long subId, String callingPkg, void sendMultipartTextForSubscriber(in int subId, String callingPkg,
in String destinationAddress, in String scAddress, in String destinationAddress, in String scAddress,
in List<String> parts, in List<PendingIntent> sentIntents, in List<String> parts, in List<PendingIntent> sentIntents,
in List<PendingIntent> deliveryIntents); in List<PendingIntent> deliveryIntents);
@@ -315,7 +315,7 @@ interface ISms {
* *
* @see #disableCellBroadcast(int) * @see #disableCellBroadcast(int)
*/ */
boolean enableCellBroadcastForSubscriber(in long subId, int messageIdentifier); boolean enableCellBroadcastForSubscriber(in int subId, int messageIdentifier);
/** /**
* Disable reception of cell broadcast (SMS-CB) messages with the given * Disable reception of cell broadcast (SMS-CB) messages with the given
@@ -344,7 +344,7 @@ interface ISms {
* *
* @see #enableCellBroadcast(int) * @see #enableCellBroadcast(int)
*/ */
boolean disableCellBroadcastForSubscriber(in long subId, int messageIdentifier); boolean disableCellBroadcastForSubscriber(in int subId, int messageIdentifier);
/* /*
* Enable reception of cell broadcast (SMS-CB) messages with the given * Enable reception of cell broadcast (SMS-CB) messages with the given
@@ -377,7 +377,7 @@ interface ISms {
* *
* @see #disableCellBroadcastRange(int, int) * @see #disableCellBroadcastRange(int, int)
*/ */
boolean enableCellBroadcastRangeForSubscriber(long subId, int startMessageId, int endMessageId); boolean enableCellBroadcastRangeForSubscriber(int subId, int startMessageId, int endMessageId);
/** /**
* Disable reception of cell broadcast (SMS-CB) messages with the given * Disable reception of cell broadcast (SMS-CB) messages with the given
@@ -410,7 +410,7 @@ interface ISms {
* *
* @see #enableCellBroadcastRange(int, int, int) * @see #enableCellBroadcastRange(int, int, int)
*/ */
boolean disableCellBroadcastRangeForSubscriber(long subId, int startMessageId, boolean disableCellBroadcastRangeForSubscriber(int subId, int startMessageId,
int endMessageId); int endMessageId);
/** /**
@@ -423,7 +423,7 @@ interface ISms {
* Returns the premium SMS send permission for the specified package. * Returns the premium SMS send permission for the specified package.
* Requires system permission. * Requires system permission.
*/ */
int getPremiumSmsPermissionForSubscriber(long subId, String packageName); int getPremiumSmsPermissionForSubscriber(int subId, String packageName);
/** /**
* Set the SMS send permission for the specified package. * Set the SMS send permission for the specified package.
@@ -439,7 +439,7 @@ interface ISms {
* Set the SMS send permission for the specified package. * Set the SMS send permission for the specified package.
* Requires system permission. * Requires system permission.
*/ */
void setPremiumSmsPermissionForSubscriber(long subId, String packageName, int permission); void setPremiumSmsPermissionForSubscriber(int subId, String packageName, int permission);
/** /**
* SMS over IMS is supported if IMS is registered and SMS is supported * SMS over IMS is supported if IMS is registered and SMS is supported
@@ -459,13 +459,13 @@ interface ISms {
* *
* @see #getImsSmsFormat() * @see #getImsSmsFormat()
*/ */
boolean isImsSmsSupportedForSubscriber(long subId); boolean isImsSmsSupportedForSubscriber(int subId);
/* /*
* get user prefered SMS subId * get user prefered SMS subId
* @return subId id * @return subId id
*/ */
long getPreferredSmsSubscription(); int getPreferredSmsSubscription();
/** /**
* Gets SMS format supported on IMS. SMS over IMS format is * Gets SMS format supported on IMS. SMS over IMS format is
@@ -489,7 +489,7 @@ interface ISms {
* *
* @see #isImsSmsSupported() * @see #isImsSmsSupported()
*/ */
String getImsSmsFormatForSubscriber(long subId); String getImsSmsFormatForSubscriber(int subId);
/* /*
* Get SMS prompt property, enabled or not * Get SMS prompt property, enabled or not
@@ -524,7 +524,7 @@ interface ISms {
* broadcast when the message is delivered to the recipient. The * broadcast when the message is delivered to the recipient. The
* raw pdu of the status report is in the extended data ("pdu"). * raw pdu of the status report is in the extended data ("pdu").
*/ */
void sendStoredText(long subId, String callingPkg, in Uri messageUri, String scAddress, void sendStoredText(int subId, String callingPkg, in Uri messageUri, String scAddress,
in PendingIntent sentIntent, in PendingIntent deliveryIntent); in PendingIntent sentIntent, in PendingIntent deliveryIntent);
/** /**
@@ -560,7 +560,7 @@ interface ISms {
* to the recipient. The raw pdu of the status report is in the * to the recipient. The raw pdu of the status report is in the
* extended data ("pdu"). * extended data ("pdu").
*/ */
void sendStoredMultipartText(long subId, String callingPkg, in Uri messageUri, void sendStoredMultipartText(int subId, String callingPkg, in Uri messageUri,
String scAddress, in List<PendingIntent> sentIntents, String scAddress, in List<PendingIntent> sentIntents,
in List<PendingIntent> deliveryIntents); in List<PendingIntent> deliveryIntents);
} }

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

@@ -25,7 +25,7 @@ interface ISub {
* @param subId The unique SubInfoRecord index in database * @param subId The unique SubInfoRecord index in database
* @return SubInfoRecord, maybe null * @return SubInfoRecord, maybe null
*/ */
SubInfoRecord getSubInfoForSubscriber(long subId); SubInfoRecord getSubInfoForSubscriber(int subId);
/** /**
* Get the SubInfoRecord according to an IccId * Get the SubInfoRecord according to an IccId
@@ -79,7 +79,7 @@ interface ISub {
* @param subId the unique SubInfoRecord index in database * @param subId the unique SubInfoRecord index in database
* @return the number of records updated * @return the number of records updated
*/ */
int setColor(int color, long subId); int setColor(int color, int subId);
/** /**
* Set display name by simInfo index * Set display name by simInfo index
@@ -87,7 +87,7 @@ interface ISub {
* @param subId the unique SubInfoRecord index in database * @param subId the unique SubInfoRecord index in database
* @return the number of records updated * @return the number of records updated
*/ */
int setDisplayName(String displayName, long subId); int setDisplayName(String displayName, int subId);
/** /**
* Set display name by simInfo index with name source * Set display name by simInfo index with name source
@@ -96,7 +96,7 @@ interface ISub {
* @param nameSource, 0: DEFAULT_SOURCE, 1: SIM_SOURCE, 2: USER_INPUT * @param nameSource, 0: DEFAULT_SOURCE, 1: SIM_SOURCE, 2: USER_INPUT
* @return the number of records updated * @return the number of records updated
*/ */
int setDisplayNameUsingSrc(String displayName, long subId, long nameSource); int setDisplayNameUsingSrc(String displayName, int subId, long nameSource);
/** /**
* Set phone number by subId * Set phone number by subId
@@ -104,7 +104,7 @@ interface ISub {
* @param subId the unique SubInfoRecord index in database * @param subId the unique SubInfoRecord index in database
* @return the number of records updated * @return the number of records updated
*/ */
int setDisplayNumber(String number, long subId); int setDisplayNumber(String number, int subId);
/** /**
* Set number display format. 0: none, 1: the first four digits, 2: the last four digits * Set number display format. 0: none, 1: the first four digits, 2: the last four digits
@@ -112,7 +112,7 @@ interface ISub {
* @param subId the unique SubInfoRecord index in database * @param subId the unique SubInfoRecord index in database
* @return the number of records updated * @return the number of records updated
*/ */
int setDisplayNumberFormat(int format, long subId); int setDisplayNumberFormat(int format, int subId);
/** /**
* Set data roaming by simInfo index * Set data roaming by simInfo index
@@ -120,35 +120,35 @@ interface ISub {
* @param subId the unique SubInfoRecord index in database * @param subId the unique SubInfoRecord index in database
* @return the number of records updated * @return the number of records updated
*/ */
int setDataRoaming(int roaming, long subId); int setDataRoaming(int roaming, int subId);
int getSlotId(long subId); int getSlotId(int subId);
long[] getSubId(int slotId); int[] getSubId(int slotId);
long getDefaultSubId(); int getDefaultSubId();
int clearSubInfo(); int clearSubInfo();
int getPhoneId(long subId); int getPhoneId(int subId);
/** /**
* Get the default data subscription * Get the default data subscription
* @return Id of the data subscription * @return Id of the data subscription
*/ */
long getDefaultDataSubId(); int getDefaultDataSubId();
void setDefaultDataSubId(long subId); void setDefaultDataSubId(int subId);
long getDefaultVoiceSubId(); int getDefaultVoiceSubId();
void setDefaultVoiceSubId(long subId); void setDefaultVoiceSubId(int subId);
long getDefaultSmsSubId(); int getDefaultSmsSubId();
void setDefaultSmsSubId(long subId); void setDefaultSmsSubId(int subId);
void clearDefaultsForInactiveSubIds(); void clearDefaultsForInactiveSubIds();
long[] getActiveSubIdList(); int[] getActiveSubIdList();
} }

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

@@ -60,7 +60,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* @return whether it hung up * @return whether it hung up
*/ */
boolean endCallForSubscriber(long subId); boolean endCallForSubscriber(int subId);
/** /**
* Answer the currently-ringing call. * Answer the currently-ringing call.
@@ -94,7 +94,7 @@ interface ITelephony {
* TODO: this should be a oneway call (especially since it's called * TODO: this should be a oneway call (especially since it's called
* directly from the key queue thread). * directly from the key queue thread).
*/ */
void answerRingingCallForSubscriber(long subId); void answerRingingCallForSubscriber(int subId);
/** /**
* Silence the ringer if an incoming call is currently ringing. * Silence the ringer if an incoming call is currently ringing.
@@ -121,7 +121,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* @return true if the phone state is OFFHOOK. * @return true if the phone state is OFFHOOK.
*/ */
boolean isOffhookForSubscriber(long subId); boolean isOffhookForSubscriber(int subId);
/** /**
* Check if an incoming phone call is ringing or call waiting * Check if an incoming phone call is ringing or call waiting
@@ -130,7 +130,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* @return true if the phone state is RINGING. * @return true if the phone state is RINGING.
*/ */
boolean isRingingForSubscriber(long subId); boolean isRingingForSubscriber(int subId);
/** /**
* Check if an incoming phone call is ringing or call waiting. * Check if an incoming phone call is ringing or call waiting.
@@ -150,7 +150,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* @return true if the phone state is IDLE. * @return true if the phone state is IDLE.
*/ */
boolean isIdleForSubscriber(long subId); boolean isIdleForSubscriber(int subId);
/** /**
* Check to see if the radio is on or not. * Check to see if the radio is on or not.
@@ -163,7 +163,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* @return returns true if the radio is on. * @return returns true if the radio is on.
*/ */
boolean isRadioOnForSubscriber(long subId); boolean isRadioOnForSubscriber(int subId);
/** /**
* Check if the SIM pin lock is enabled. * Check if the SIM pin lock is enabled.
@@ -185,7 +185,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* @return whether the operation was a success. * @return whether the operation was a success.
*/ */
boolean supplyPinForSubscriber(long subId, String pin); boolean supplyPinForSubscriber(int subId, String pin);
/** /**
* Supply puk to unlock the SIM and set SIM pin to new pin. * Supply puk to unlock the SIM and set SIM pin to new pin.
@@ -204,7 +204,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* @return whether the operation was a success. * @return whether the operation was a success.
*/ */
boolean supplyPukForSubscriber(long subId, String puk, String pin); boolean supplyPukForSubscriber(int subId, String puk, String pin);
/** /**
* Supply a pin to unlock the SIM. Blocks until a result is determined. * Supply a pin to unlock the SIM. Blocks until a result is determined.
@@ -222,7 +222,7 @@ interface ITelephony {
* @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code * @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code
* retValue[1] = number of attempts remaining if known otherwise -1 * retValue[1] = number of attempts remaining if known otherwise -1
*/ */
int[] supplyPinReportResultForSubscriber(long subId, String pin); int[] supplyPinReportResultForSubscriber(int subId, String pin);
/** /**
* Supply puk to unlock the SIM and set SIM pin to new pin. * Supply puk to unlock the SIM and set SIM pin to new pin.
@@ -244,7 +244,7 @@ interface ITelephony {
* @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code * @return retValue[0] = Phone.PIN_RESULT_SUCCESS on success. Otherwise error code
* retValue[1] = number of attempts remaining if known otherwise -1 * retValue[1] = number of attempts remaining if known otherwise -1
*/ */
int[] supplyPukReportResultForSubscriber(long subId, String puk, String pin); int[] supplyPukReportResultForSubscriber(int subId, String puk, String pin);
/** /**
* Handles PIN MMI commands (PIN/PIN2/PUK/PUK2), which are initiated * Handles PIN MMI commands (PIN/PIN2/PUK/PUK2), which are initiated
@@ -263,7 +263,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* @return true if MMI command is executed. * @return true if MMI command is executed.
*/ */
boolean handlePinMmiForSubscriber(long subId, String dialString); boolean handlePinMmiForSubscriber(int subId, String dialString);
/** /**
* Toggles the radio on or off. * Toggles the radio on or off.
@@ -274,7 +274,7 @@ interface ITelephony {
* Toggles the radio on or off on particular subId. * Toggles the radio on or off on particular subId.
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
void toggleRadioOnOffForSubscriber(long subId); void toggleRadioOnOffForSubscriber(int subId);
/** /**
* Set the radio to on or off * Set the radio to on or off
@@ -285,7 +285,7 @@ interface ITelephony {
* Set the radio to on or off on particular subId. * Set the radio to on or off on particular subId.
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
boolean setRadioForSubscriber(long subId, boolean turnOn); boolean setRadioForSubscriber(int subId, boolean turnOn);
/** /**
* Set the radio to on or off unconditionally * Set the radio to on or off unconditionally
@@ -301,7 +301,7 @@ interface ITelephony {
* Request to update location information for a subscrition in service state * Request to update location information for a subscrition in service state
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
void updateServiceLocationForSubscriber(long subId); void updateServiceLocationForSubscriber(int subId);
/** /**
* Enable location update notifications. * Enable location update notifications.
@@ -312,7 +312,7 @@ interface ITelephony {
* Enable location update notifications. * Enable location update notifications.
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
void enableLocationUpdatesForSubscriber(long subId); void enableLocationUpdatesForSubscriber(int subId);
/** /**
* Disable location update notifications. * Disable location update notifications.
@@ -323,7 +323,7 @@ interface ITelephony {
* Disable location update notifications. * Disable location update notifications.
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
void disableLocationUpdatesForSubscriber(long subId); void disableLocationUpdatesForSubscriber(int subId);
/** /**
* Allow mobile data connections. * Allow mobile data connections.
@@ -352,7 +352,7 @@ interface ITelephony {
/** /**
* Returns the call state for a subId. * Returns the call state for a subId.
*/ */
int getCallStateForSubscriber(long subId); int getCallStateForSubscriber(int subId);
int getDataActivity(); int getDataActivity();
int getDataState(); int getDataState();
@@ -370,7 +370,7 @@ interface ITelephony {
* and TelephonyManager.PHONE_TYPE_GSM if RILConstants.GSM_PHONE * and TelephonyManager.PHONE_TYPE_GSM if RILConstants.GSM_PHONE
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
int getActivePhoneTypeForSubscriber(long subId); int getActivePhoneTypeForSubscriber(int subId);
/** /**
* Returns the CDMA ERI icon index to display * Returns the CDMA ERI icon index to display
@@ -381,7 +381,7 @@ interface ITelephony {
* Returns the CDMA ERI icon index to display on particular subId. * Returns the CDMA ERI icon index to display on particular subId.
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
int getCdmaEriIconIndexForSubscriber(long subId); int getCdmaEriIconIndexForSubscriber(int subId);
/** /**
* Returns the CDMA ERI icon mode, * Returns the CDMA ERI icon mode,
@@ -396,7 +396,7 @@ interface ITelephony {
* 1 - FLASHING * 1 - FLASHING
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
int getCdmaEriIconModeForSubscriber(long subId); int getCdmaEriIconModeForSubscriber(int subId);
/** /**
* Returns the CDMA ERI text, * Returns the CDMA ERI text,
@@ -407,7 +407,7 @@ interface ITelephony {
* Returns the CDMA ERI text for particular subId, * Returns the CDMA ERI text for particular subId,
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
String getCdmaEriTextForSubscriber(long subId); String getCdmaEriTextForSubscriber(int subId);
/** /**
* Returns true if OTA service provisioning needs to run. * Returns true if OTA service provisioning needs to run.
@@ -426,7 +426,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* Returns the unread count of voicemails * Returns the unread count of voicemails
*/ */
int getVoiceMessageCountForSubscriber(long subId); int getVoiceMessageCountForSubscriber(int subId);
/** /**
* Returns the network type for data transmission * Returns the network type for data transmission
@@ -438,7 +438,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* Returns the network type * Returns the network type
*/ */
int getNetworkTypeForSubscriber(long subId); int getNetworkTypeForSubscriber(int subId);
/** /**
* Returns the network type for data transmission * Returns the network type for data transmission
@@ -450,7 +450,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* Returns the network type * Returns the network type
*/ */
int getDataNetworkTypeForSubscriber(long subId); int getDataNetworkTypeForSubscriber(int subId);
/** /**
* Returns the network type for voice * Returns the network type for voice
@@ -462,7 +462,7 @@ interface ITelephony {
* @param subId user preferred subId. * @param subId user preferred subId.
* Returns the network type * Returns the network type
*/ */
int getVoiceNetworkTypeForSubscriber(long subId); int getVoiceNetworkTypeForSubscriber(int subId);
/** /**
* Return true if an ICC card is present * Return true if an ICC card is present
@@ -474,7 +474,7 @@ interface ITelephony {
* @param slotId user preferred slotId. * @param slotId user preferred slotId.
* Return true if an ICC card is present * Return true if an ICC card is present
*/ */
boolean hasIccCardUsingSlotId(long slotId); boolean hasIccCardUsingSlotId(int slotId);
/** /**
* Return if the current radio is LTE on CDMA. This * Return if the current radio is LTE on CDMA. This
@@ -494,7 +494,7 @@ interface ITelephony {
* @return {@link Phone#LTE_ON_CDMA_UNKNOWN}, {@link Phone#LTE_ON_CDMA_FALSE} * @return {@link Phone#LTE_ON_CDMA_UNKNOWN}, {@link Phone#LTE_ON_CDMA_FALSE}
* or {@link PHone#LTE_ON_CDMA_TRUE} * or {@link PHone#LTE_ON_CDMA_TRUE}
*/ */
int getLteOnCdmaModeForSubscriber(long subId); int getLteOnCdmaModeForSubscriber(int subId);
/** /**
* Returns the all observed cell information of the device. * Returns the all observed cell information of the device.
@@ -689,13 +689,13 @@ interface ITelephony {
* Return MDN string for CDMA phone. * Return MDN string for CDMA phone.
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
String getCdmaMdn(long subId); String getCdmaMdn(int subId);
/** /**
* Return MIN string for CDMA phone. * Return MIN string for CDMA phone.
* @param subId user preferred subId. * @param subId user preferred subId.
*/ */
String getCdmaMin(long subId); String getCdmaMin(int subId);
/** /**
* Has the calling application been granted special privileges by the carrier. * Has the calling application been granted special privileges by the carrier.
@@ -733,7 +733,7 @@ interface ITelephony {
* @param subId for which the simplified UI should be enabled or disabled. * @param subId for which the simplified UI should be enabled or disabled.
* @param enable true means enabling the simplified UI. * @param enable true means enabling the simplified UI.
*/ */
void enableSimplifiedNetworkSettingsForSubscriber(long subId, boolean enable); void enableSimplifiedNetworkSettingsForSubscriber(int subId, boolean enable);
/** /**
* Get whether a simplified Mobile Network Settings UI is enabled for the * Get whether a simplified Mobile Network Settings UI is enabled for the
@@ -742,7 +742,7 @@ interface ITelephony {
* @param subId for which the simplified UI should be enabled or disabled. * @param subId for which the simplified UI should be enabled or disabled.
* @return true if the simplified UI is enabled. * @return true if the simplified UI is enabled.
*/ */
boolean getSimplifiedNetworkSettingsEnabledForSubscriber(long subId); boolean getSimplifiedNetworkSettingsEnabledForSubscriber(int subId);
/** /**
* Set the line 1 phone number string and its alphatag for the current ICCID * Set the line 1 phone number string and its alphatag for the current ICCID
@@ -754,7 +754,7 @@ interface ITelephony {
* @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
*/ */
void setLine1NumberForDisplayForSubscriber(long subId, String alphaTag, String number); void 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
@@ -763,7 +763,7 @@ interface ITelephony {
* @param subId whose dialing number for line 1 is returned. * @param subId whose dialing number for line 1 is returned.
* @return the displayed dialing number if set, or null if not set. * @return the displayed dialing number if set, or null if not set.
*/ */
String getLine1NumberForDisplay(long subId); String getLine1NumberForDisplay(int subId);
/** /**
* Returns the displayed alphatag of the dialing number if it was set * Returns the displayed alphatag of the dialing number if it was set
@@ -773,7 +773,7 @@ interface ITelephony {
* @return the displayed alphatag of the dialing number if set, or null if * @return the displayed alphatag of the dialing number if set, or null if
* not set. * not set.
*/ */
String getLine1AlphaTagForDisplay(long subId); String getLine1AlphaTagForDisplay(int subId);
/** /**
* Override the operator branding for the current ICCID. * Override the operator branding for the current ICCID.

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

@@ -30,28 +30,28 @@ import com.android.internal.telephony.IPhoneStateListener;
interface ITelephonyRegistry { interface ITelephonyRegistry {
void listen(String pkg, IPhoneStateListener callback, int events, boolean notifyNow); void listen(String pkg, IPhoneStateListener callback, int events, boolean notifyNow);
void listenForSubscriber(in long subId, String pkg, IPhoneStateListener callback, int events, void listenForSubscriber(in int subId, String pkg, IPhoneStateListener callback, int events,
boolean notifyNow); boolean notifyNow);
void notifyCallState(int state, String incomingNumber); void notifyCallState(int state, String incomingNumber);
void notifyCallStateForSubscriber(in long subId, int state, String incomingNumber); void notifyCallStateForSubscriber(in int subId, int state, String incomingNumber);
void notifyServiceStateForPhoneId(in int phoneId, in long subId, in ServiceState state); void notifyServiceStateForPhoneId(in int phoneId, in int subId, in ServiceState state);
void notifySignalStrength(in SignalStrength signalStrength); void notifySignalStrength(in SignalStrength signalStrength);
void notifySignalStrengthForSubscriber(in long subId, in SignalStrength signalStrength); void notifySignalStrengthForSubscriber(in int subId, in SignalStrength signalStrength);
void notifyMessageWaitingChangedForPhoneId(in int phoneId, in long subId, in boolean mwi); void notifyMessageWaitingChangedForPhoneId(in int phoneId, in int subId, in boolean mwi);
void notifyCallForwardingChanged(boolean cfi); void notifyCallForwardingChanged(boolean cfi);
void notifyCallForwardingChangedForSubscriber(in long subId, boolean cfi); void notifyCallForwardingChangedForSubscriber(in int subId, boolean cfi);
void notifyDataActivity(int state); void notifyDataActivity(int state);
void notifyDataActivityForSubscriber(in long subId, int state); void notifyDataActivityForSubscriber(in int subId, int state);
void notifyDataConnection(int state, boolean isDataConnectivityPossible, void notifyDataConnection(int state, boolean isDataConnectivityPossible,
String reason, String apn, String apnType, in LinkProperties linkProperties, String reason, String apn, String apnType, in LinkProperties linkProperties,
in NetworkCapabilities networkCapabilities, int networkType, boolean roaming); in NetworkCapabilities networkCapabilities, int networkType, boolean roaming);
void notifyDataConnectionForSubscriber(long subId, int state, boolean isDataConnectivityPossible, void notifyDataConnectionForSubscriber(int subId, int state, boolean isDataConnectivityPossible,
String reason, String apn, String apnType, in LinkProperties linkProperties, String reason, String apn, String apnType, in LinkProperties linkProperties,
in NetworkCapabilities networkCapabilities, int networkType, boolean roaming); in NetworkCapabilities networkCapabilities, int networkType, boolean roaming);
void notifyDataConnectionFailed(String reason, String apnType); void notifyDataConnectionFailed(String reason, String apnType);
void notifyDataConnectionFailedForSubscriber(long subId, String reason, String apnType); void notifyDataConnectionFailedForSubscriber(int subId, String reason, String apnType);
void notifyCellLocation(in Bundle cellLocation); void notifyCellLocation(in Bundle cellLocation);
void notifyCellLocationForSubscriber(in long subId, in Bundle cellLocation); void notifyCellLocationForSubscriber(in int subId, in Bundle cellLocation);
void notifyOtaspChanged(in int otaspMode); void notifyOtaspChanged(in int otaspMode);
void notifyCellInfo(in List<CellInfo> cellInfo); void notifyCellInfo(in List<CellInfo> cellInfo);
void notifyPreciseCallState(int ringingCallState, int foregroundCallState, void notifyPreciseCallState(int ringingCallState, int foregroundCallState,
@@ -59,8 +59,8 @@ interface ITelephonyRegistry {
void notifyDisconnectCause(int disconnectCause, int preciseDisconnectCause); void notifyDisconnectCause(int disconnectCause, int preciseDisconnectCause);
void notifyPreciseDataConnectionFailed(String reason, String apnType, String apn, void notifyPreciseDataConnectionFailed(String reason, String apnType, String apn,
String failCause); String failCause);
void notifyCellInfoForSubscriber(in long subId, in List<CellInfo> cellInfo); void notifyCellInfoForSubscriber(in int subId, in List<CellInfo> cellInfo);
void notifyDataConnectionRealTimeInfo(in DataConnectionRealTimeInfo dcRtInfo); void notifyDataConnectionRealTimeInfo(in DataConnectionRealTimeInfo dcRtInfo);
void notifyVoLteServiceStateChanged(in VoLteServiceState lteState); void notifyVoLteServiceStateChanged(in VoLteServiceState lteState);
void notifyOemHookRawEventForSubscriber(in long subId, in byte[] rawData); void notifyOemHookRawEventForSubscriber(in int subId, in byte[] rawData);
} }