diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 88e34b35a0f59..36e3bdbff9acc 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -315,16 +315,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 diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl index 507b0170c17e0..e3b7d59c8210f 100755 --- a/telephony/java/com/android/internal/telephony/ISub.aidl +++ b/telephony/java/com/android/internal/telephony/ISub.aidl @@ -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(); }