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

Change-Id: If42f8c76ad0d347a3b387de4fa806148a0a2d780

3 files changed, 12 insertions, 13 deletions

diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
index e3f3520..6a05e3d 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -75,8 +75,8 @@ public class CallLogProvider extends ContentProvider {
         sCallsProjectionMap.put(Calls.DATE, Calls.DATE);
         sCallsProjectionMap.put(Calls.DURATION, Calls.DURATION);
         sCallsProjectionMap.put(Calls.TYPE, Calls.TYPE);
-        sCallsProjectionMap.put(Calls.SUBSCRIPTION_COMPONENT_NAME, Calls.SUBSCRIPTION_COMPONENT_NAME);
-        sCallsProjectionMap.put(Calls.SUBSCRIPTION_ID, Calls.SUBSCRIPTION_ID);
+        sCallsProjectionMap.put(Calls.ACCOUNT_COMPONENT_NAME, Calls.ACCOUNT_COMPONENT_NAME);
+        sCallsProjectionMap.put(Calls.ACCOUNT_ID, Calls.ACCOUNT_ID);
         sCallsProjectionMap.put(Calls.NEW, Calls.NEW);
         sCallsProjectionMap.put(Calls.VOICEMAIL_URI, Calls.VOICEMAIL_URI);
         sCallsProjectionMap.put(Calls.IS_READ, Calls.IS_READ);
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index 8034841..fe5e312 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -1466,8 +1466,8 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
                 Calls.DATE + " INTEGER," +
                 Calls.DURATION + " INTEGER," +
                 Calls.TYPE + " INTEGER," +
-                Calls.SUBSCRIPTION_COMPONENT_NAME + " TEXT," +
-                Calls.SUBSCRIPTION_ID + " TEXT," +
+                Calls.ACCOUNT_COMPONENT_NAME + " TEXT," +
+                Calls.ACCOUNT_ID + " TEXT," +
                 Calls.NEW + " INTEGER," +
                 Calls.CACHED_NAME + " TEXT," +
                 Calls.CACHED_NUMBER_TYPE + " INTEGER," +
@@ -4056,9 +4056,9 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
     }
 
     private void upgradeToVersion902(SQLiteDatabase db) {
-        // adding subscription identifier to call log table
-        db.execSQL("ALTER TABLE calls ADD "+ Calls.SUBSCRIPTION_COMPONENT_NAME + " TEXT;");
-        db.execSQL("ALTER TABLE calls ADD "+ Calls.SUBSCRIPTION_ID + " TEXT;");
+        // adding account identifier to call log table
+        db.execSQL("ALTER TABLE calls ADD "+ Calls.ACCOUNT_COMPONENT_NAME + " TEXT;");
+        db.execSQL("ALTER TABLE calls ADD "+ Calls.ACCOUNT_ID + " TEXT;");
     }
 
     /**
diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
index 072b572..8c6719f 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -19,7 +19,6 @@ package com.android.providers.contacts;
 import com.android.internal.telephony.CallerInfo;
 import com.android.internal.telephony.PhoneConstants;
 
-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -35,7 +34,7 @@ import android.provider.CallLog.Calls;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.VoicemailContract.Voicemails;
-import android.telecomm.Subscription;
+import android.telecomm.PhoneAccount;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import java.util.Arrays;
@@ -186,8 +185,8 @@ public class CallLogProviderTest extends BaseContactsProvider2Test {
         final ComponentName sComponentName = new ComponentName(
                 "com.android.telecomm",
                 "TelecommServiceImpl");
-        Subscription subscription = new Subscription(
-                sComponentName, "sub0", Uri.parse("tel:000-000-0000"), 0, 0, 0, true, true);
+        PhoneAccount subscription = new PhoneAccount(
+                sComponentName, "sub0", Uri.parse("tel:000-000-0000"), "", "", true, true);
 
         Uri uri = Calls.addCall(ci, getMockContext(), "1-800-263-7643",
                 PhoneConstants.PRESENTATION_ALLOWED, Calls.OUTGOING_TYPE, subscription, 2000, 40);
@@ -203,8 +202,8 @@ public class CallLogProviderTest extends BaseContactsProvider2Test {
         values.put(Calls.CACHED_NUMBER_LABEL, "Directory");
         values.put(Calls.COUNTRY_ISO, "us");
         values.put(Calls.GEOCODED_LOCATION, "usa");
-        values.put(Calls.SUBSCRIPTION_COMPONENT_NAME, "com.android.telecomm/TelecommServiceImpl");
-        values.put(Calls.SUBSCRIPTION_ID, "sub0");
+        values.put(Calls.ACCOUNT_COMPONENT_NAME, "com.android.telecomm/TelecommServiceImpl");
+        values.put(Calls.ACCOUNT_ID, "sub0");
         assertStoredValues(uri, values);
     }