From 8a38a203a9754be85e12484adff69f7577fa4fad Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Wed, 3 Sep 2014 12:22:54 -0700
Subject: [PATCH] Rename getActivatedXxx to getActiveXxx

Change-Id: Iba6d2805a69d3385c93b7ed3c6267b5b8b252a28
---
 .../android/telephony/SubscriptionManager.java     | 14 +++++++-------
 .../java/com/android/internal/telephony/ISub.aidl  |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 0d61f57befdfb..f83f164b3654a 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -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
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();
 }