Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baaa4ef6 authored Sep 03, 2014 by Wink Saville Committed by Android (Google) Code Review Sep 03, 2014

Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev

parents ddfa8e18 8a38a203

telephony/java/android/telephony/SubscriptionManager.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -316,16 +316,16 @@ public class SubscriptionManager implements BaseColumns {
		}

		/**
		* Get the count of activated SUB(s)
		* @return activated SIM count
		* Get the count of active SUB(s)
		* @return active SIM count
		*/
		public static int getActivatedSubInfoCount() {
		public static int getActiveSubInfoCount() {
		int result = 0;

		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		result = iSub.getActivatedSubInfoCount();
		result = iSub.getActiveSubInfoCount();
		}
		} catch (RemoteException ex) {
		// ignore it
		@@ -813,16 +813,16 @@ public class SubscriptionManager implements BaseColumns {
		}

		/**
		* @return the list of subId's that are activated,
		* @return the list of subId's that are active,
		* is never null but the length maybe 0.
		*/
		public static long[] getActivatedSubIdList() {
		public static long[] getActiveSubIdList() {
		long[] subId = null;

		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		subId = iSub.getActivatedSubIdList();
		subId = iSub.getActiveSubIdList();
		}
		} catch (RemoteException ex) {
		// ignore it

telephony/java/com/android/internal/telephony/ISub.aidl

+4 −4

Original line number	Diff line number	Diff line
		@@ -66,11 +66,11 @@ interface ISub {
		int getAllSubInfoCount();

		/**
		* Get the count of activated SUB(s)
		* Get the count of active SUB(s)
		* @param context Context provided by caller
		* @return activated SIM count
		* @return active SIM count
		*/
		int getActivatedSubInfoCount();
		int getActiveSubInfoCount();

		/**
		* Add a new SubInfoRecord to subinfo database if needed
		@@ -164,5 +164,5 @@ interface ISub {

		void clearDefaultsForInactiveSubIds();

		long[] getActivatedSubIdList();
		long[] getActiveSubIdList();
		}