Merge "Change suffix UsingSubId to ForSubscriber." into lmp-dev (691b8d29) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/SmsManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -465,7 +465,7 @@ public final class SmsManager {
		*
		* {@hide}
		*/
		public static SmsManager getSmsManagerUsingSubId(long subId) {
		public static SmsManager getSmsManagerForSubscriber(long subId) {
		// TODO(shri): Add javadoc link once SubscriptionManager is made public api
		synchronized(sLockObject) {
		SmsManager smsManager = sSubInstances.get(subId);

src/java/com/android/internal/telephony/DefaultPhoneNotifier.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		}
		try {
		if (mRegistry != null) {
		mRegistry.notifyCallStateUsingSubId(subId,
		mRegistry.notifyCallStateForSubscriber(subId,
		convertCallState(sender.getState()), incomingNumber);
		}
		} catch (RemoteException ex) {
		@@ -125,7 +125,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		}
		try {
		if (mRegistry != null) {
		mRegistry.notifyServiceStateUsingSubId(subId, ss);
		mRegistry.notifyServiceStateForSubscriber(subId, ss);
		}
		} catch (RemoteException ex) {
		// system process is dead
		@@ -139,7 +139,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		+ " ss=" + sender.getSignalStrength() + " sender=" + sender);
		try {
		if (mRegistry != null) {
		mRegistry.notifySignalStrengthUsingSubId(subId, sender.getSignalStrength());
		mRegistry.notifySignalStrengthForSubscriber(subId, sender.getSignalStrength());
		}
		} catch (RemoteException ex) {
		// system process is dead
		@@ -151,7 +151,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		long subId = sender.getSubId();
		try {
		if (mRegistry != null) {
		mRegistry.notifyMessageWaitingChangedUsingSubId(subId,
		mRegistry.notifyMessageWaitingChangedForSubscriber(subId,
		sender.getMessageWaitingIndicator());
		}
		} catch (RemoteException ex) {
		@@ -164,7 +164,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		long subId = sender.getSubId();
		try {
		if (mRegistry != null) {
		mRegistry.notifyCallForwardingChangedUsingSubId(subId,
		mRegistry.notifyCallForwardingChangedForSubscriber(subId,
		sender.getCallForwardingIndicator());
		}
		} catch (RemoteException ex) {
		@@ -177,7 +177,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		long subId = sender.getSubId();
		try {
		if (mRegistry != null) {
		mRegistry.notifyDataActivityUsingSubId(subId,
		mRegistry.notifyDataActivityForSubscriber(subId,
		convertDataActivityState(sender.getDataActivityState()));
		}
		} catch (RemoteException ex) {
		@@ -214,7 +214,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {

		try {
		if (mRegistry != null) {
		mRegistry.notifyDataConnectionUsingSubId(subId,
		mRegistry.notifyDataConnectionForSubscriber(subId,
		convertDataState(state),
		sender.isDataConnectivityPossible(apnType), reason,
		sender.getActiveApnHost(apnType),
		@@ -235,7 +235,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		long subId = sender.getSubId();
		try {
		if (mRegistry != null) {
		mRegistry.notifyDataConnectionFailedUsingSubId(subId, reason, apnType);
		mRegistry.notifyDataConnectionFailedForSubscriber(subId, reason, apnType);
		}
		} catch (RemoteException ex) {
		// system process is dead
		@@ -249,7 +249,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		sender.getCellLocation().fillInNotifierBundle(data);
		try {
		if (mRegistry != null) {
		mRegistry.notifyCellLocationUsingSubId(subId, data);
		mRegistry.notifyCellLocationForSubscriber(subId, data);
		}
		} catch (RemoteException ex) {
		// system process is dead
		@@ -261,7 +261,7 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		long subId = sender.getSubId();
		try {
		if (mRegistry != null) {
		mRegistry.notifyCellInfoUsingSubId(subId, cellInfo);
		mRegistry.notifyCellInfoForSubscriber(subId, cellInfo);
		}
		} catch (RemoteException ex) {

src/java/com/android/internal/telephony/IIccPhoneBook.aidl

+4 −4

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ interface IIccPhoneBook {
		* @param subId user preferred subId
		* @return List of AdnRecord
		*/
		List<AdnRecord> getAdnRecordsInEfUsingSubId(long subId, int efid);
		List<AdnRecord> getAdnRecordsInEfForSubscriber(long subId, int efid);

		/**
		* Replace oldAdn with newAdn in ADN-like record in EF
		@@ -99,7 +99,7 @@ interface IIccPhoneBook {
		* @param subId user preferred subId
		* @return true for success
		*/
		boolean updateAdnRecordsInEfBySearchUsingSubId(long subId, int efid,
		boolean updateAdnRecordsInEfBySearchForSubscriber(long subId, int efid,
		String oldTag, String oldPhoneNumber,
		String newTag, String newPhoneNumber,
		String pin2);
		@@ -138,7 +138,7 @@ interface IIccPhoneBook {
		* @param subId user preferred subId
		* @return true for success
		*/
		boolean updateAdnRecordsInEfByIndexUsingSubId(long subId, int efid, String newTag,
		boolean updateAdnRecordsInEfByIndexForSubscriber(long subId, int efid, String newTag,
		String newPhoneNumber, int index,
		String pin2);

		@@ -163,6 +163,6 @@ interface IIccPhoneBook {
		* recordSizes[1] is the total length of the EF file
		* recordSizes[2] is the number of records in the EF file
		*/
		int[] getAdnRecordsSizeUsingSubId(long subId, int efid);
		int[] getAdnRecordsSizeForSubscriber(long subId, int efid);

		}

src/java/com/android/internal/telephony/IccProvider.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -394,7 +394,7 @@ public class IccProvider extends ContentProvider {
		IIccPhoneBook iccIpb = IIccPhoneBook.Stub.asInterface(
		ServiceManager.getService("simphonebook"));
		if (iccIpb != null) {
		adnRecords = iccIpb.getAdnRecordsInEfUsingSubId(subId, efType);
		adnRecords = iccIpb.getAdnRecordsInEfForSubscriber(subId, efType);
		}
		} catch (RemoteException ex) {
		// ignore it
		@@ -435,7 +435,7 @@ public class IccProvider extends ContentProvider {
		IIccPhoneBook iccIpb = IIccPhoneBook.Stub.asInterface(
		ServiceManager.getService("simphonebook"));
		if (iccIpb != null) {
		success = iccIpb.updateAdnRecordsInEfBySearchUsingSubId(subId, efType,
		success = iccIpb.updateAdnRecordsInEfBySearchForSubscriber(subId, efType,
		"", "", name, number, pin2);
		}
		} catch (RemoteException ex) {
		@@ -461,7 +461,7 @@ public class IccProvider extends ContentProvider {
		IIccPhoneBook iccIpb = IIccPhoneBook.Stub.asInterface(
		ServiceManager.getService("simphonebook"));
		if (iccIpb != null) {
		success = iccIpb.updateAdnRecordsInEfBySearchUsingSubId(subId, efType, oldName,
		success = iccIpb.updateAdnRecordsInEfBySearchForSubscriber(subId, efType, oldName,
		oldNumber, newName, newNumber, pin2);
		}
		} catch (RemoteException ex) {
		@@ -486,7 +486,7 @@ public class IccProvider extends ContentProvider {
		IIccPhoneBook iccIpb = IIccPhoneBook.Stub.asInterface(
		ServiceManager.getService("simphonebook"));
		if (iccIpb != null) {
		success = iccIpb.updateAdnRecordsInEfBySearchUsingSubId(subId, efType,
		success = iccIpb.updateAdnRecordsInEfBySearchForSubscriber(subId, efType,
		name, number, "", "", pin2);
		}
		} catch (RemoteException ex) {

src/java/com/android/internal/telephony/PhoneSubInfoController.java

+21 −21

Original line number	Diff line number	Diff line
		@@ -44,10 +44,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {


		public String getDeviceId() {
		return getDeviceIdUsingSubId(getDefaultSubscription());
		return getDeviceIdForSubscriber(getDefaultSubscription());
		}

		public String getDeviceIdUsingSubId(long subId) {
		public String getDeviceIdForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getDeviceId();
		@@ -58,7 +58,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}
		}

		public String getImeiUsingSubId(long subId) {
		public String getImeiForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getImei();
		@@ -80,10 +80,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}

		public String getSubscriberId() {
		return getSubscriberIdUsingSubId(getDefaultSubscription());
		return getSubscriberIdForSubscriber(getDefaultSubscription());
		}

		public String getSubscriberIdUsingSubId(long subId) {
		public String getSubscriberIdForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getSubscriberId();
		@@ -98,10 +98,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		* Retrieves the serial number of the ICC, if applicable.
		*/
		public String getIccSerialNumber() {
		return getIccSerialNumberUsingSubId(getDefaultSubscription());
		return getIccSerialNumberForSubscriber(getDefaultSubscription());
		}

		public String getIccSerialNumberUsingSubId(long subId) {
		public String getIccSerialNumberForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getIccSerialNumber();
		@@ -113,10 +113,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}

		public String getLine1Number() {
		return getLine1NumberUsingSubId(getDefaultSubscription());
		return getLine1NumberForSubscriber(getDefaultSubscription());
		}

		public String getLine1NumberUsingSubId(long subId) {
		public String getLine1NumberForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getLine1Number();
		@@ -128,10 +128,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}

		public String getLine1AlphaTag() {
		return getLine1AlphaTagUsingSubId(getDefaultSubscription());
		return getLine1AlphaTagForSubscriber(getDefaultSubscription());
		}

		public String getLine1AlphaTagUsingSubId(long subId) {
		public String getLine1AlphaTagForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getLine1AlphaTag();
		@@ -143,10 +143,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}

		public String getMsisdn() {
		return getMsisdnUsingSubId(getDefaultSubscription());
		return getMsisdnForSubscriber(getDefaultSubscription());
		}

		public String getMsisdnUsingSubId(long subId) {
		public String getMsisdnForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getMsisdn();
		@@ -158,10 +158,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}

		public String getVoiceMailNumber() {
		return getVoiceMailNumberUsingSubId(getDefaultSubscription());
		return getVoiceMailNumberForSubscriber(getDefaultSubscription());
		}

		public String getVoiceMailNumberUsingSubId(long subId) {
		public String getVoiceMailNumberForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getVoiceMailNumber();
		@@ -173,10 +173,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}

		public String getCompleteVoiceMailNumber() {
		return getCompleteVoiceMailNumberUsingSubId(getDefaultSubscription());
		return getCompleteVoiceMailNumberForSubscriber(getDefaultSubscription());
		}

		public String getCompleteVoiceMailNumberUsingSubId(long subId) {
		public String getCompleteVoiceMailNumberForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getCompleteVoiceMailNumber();
		@@ -188,10 +188,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}

		public String getVoiceMailAlphaTag() {
		return getVoiceMailAlphaTagUsingSubId(getDefaultSubscription());
		return getVoiceMailAlphaTagForSubscriber(getDefaultSubscription());
		}

		public String getVoiceMailAlphaTagUsingSubId(long subId) {
		public String getVoiceMailAlphaTagForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getVoiceMailAlphaTag();
		@@ -267,10 +267,10 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		}

		public String getGroupIdLevel1() {
		return getGroupIdLevel1UsingSubId(getDefaultSubscription());
		return getGroupIdLevel1ForSubscriber(getDefaultSubscription());
		}

		public String getGroupIdLevel1UsingSubId(long subId) {
		public String getGroupIdLevel1ForSubscriber(long subId) {
		PhoneSubInfoProxy phoneSubInfoProxy = getPhoneSubInfoProxy(subId);
		if (phoneSubInfoProxy != null) {
		return phoneSubInfoProxy.getGroupIdLevel1();