Rename Telecomm "Subscription" to "Account" (1/7)

Change-Id: Ieb29f6ba9dadacb2c7e26969a47141e11a339a40

Conflicts:
	telecomm/java/android/telecomm/InCallCall.java

1 files changed, 18 insertions, 15 deletions

diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index 8eefd9c..acc74d8 100644
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -25,7 +25,7 @@ import android.net.Uri;
 import android.provider.ContactsContract.CommonDataKinds.Callable;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.DataUsageFeedback;
-import android.telecomm.Subscription;
+import android.telecomm.PhoneAccount;
 import android.text.TextUtils;
 
 import com.android.internal.telephony.CallerInfo;
@@ -276,17 +276,20 @@ public class CallLog {
          */
         public static final String CACHED_FORMATTED_NUMBER = "formatted_number";
 
+        // Note: PHONE_ACCOUNT_* constant values are "subscription_*" due to a historic naming
+        // that was encoded into call log databases.
+
         /**
-         * The component name of the subscription in string form.
+         * The component name of the account in string form.
          * <P>Type: TEXT</P>
          */
-        public static final String SUBSCRIPTION_COMPONENT_NAME = "subscription_component_name";
+        public static final String PHONE_ACCOUNT_COMPONENT_NAME = "subscription_component_name";
 
         /**
-         * The identifier of a subscription that is unique to a specified component.
+         * The identifier of a account that is unique to a specified component.
          * <P>Type: TEXT</P>
          */
-        public static final String SUBSCRIPTION_ID = "subscription_id";
+        public static final String PHONE_ACCOUNT_ID = "subscription_id";
 
         /**
          * Adds a call to the call log.
@@ -299,14 +302,14 @@ public class CallLog {
          *        is set by the network and denotes the number presenting rules for
          *        "allowed", "payphone", "restricted" or "unknown"
          * @param callType enumerated values for "incoming", "outgoing", or "missed"
-         * @param subscription The subscription object describing the provider of the call
+         * @param account The account object describing the provider of the call
          * @param start time stamp for the call in milliseconds
          * @param duration call duration in seconds
          *
          * {@hide}
          */
         public static Uri addCall(CallerInfo ci, Context context, String number,
-                int presentation, int callType, Subscription subscription, long start, int duration) {
+                int presentation, int callType, PhoneAccount account, long start, int duration) {
             final ContentResolver resolver = context.getContentResolver();
             int numberPresentation = PRESENTATION_ALLOWED;
 
@@ -330,12 +333,12 @@ public class CallLog {
                 }
             }
 
-            // subscription information
-            String subscriptionComponentString = null;
-            String subscriptionId = null;
-            if (subscription != null) {
-                subscriptionComponentString = subscription.getComponentName().flattenToString();
-                subscriptionId = subscription.getId();
+            // account information
+            String accountComponentString = null;
+            String accountId = null;
+            if (account != null) {
+                accountComponentString = account.getComponentName().flattenToString();
+                accountId = account.getId();
             }
 
             ContentValues values = new ContentValues(6);
@@ -345,8 +348,8 @@ public class CallLog {
             values.put(TYPE, Integer.valueOf(callType));
             values.put(DATE, Long.valueOf(start));
             values.put(DURATION, Long.valueOf(duration));
-            values.put(SUBSCRIPTION_COMPONENT_NAME, subscriptionComponentString);
-            values.put(SUBSCRIPTION_ID, subscriptionId);
+            values.put(PHONE_ACCOUNT_COMPONENT_NAME, accountComponentString);
+            values.put(PHONE_ACCOUNT_ID, accountId);
             values.put(NEW, Integer.valueOf(1));
             if (callType == MISSED_TYPE) {
                 values.put(IS_READ, Integer.valueOf(0));