commit b078d625665a07e1349bcf7b3c6eff56400f9917
author Ihab Awad <ihab@google.com> Wed Jul 02 13:35:41 2014 -0700
committer Ihab Awad <ihab@google.com> Wed Jul 02 13:53:50 2014 -0700
tree c120e56fc2dab45a0b4b704e64eea6f63af9a0a2
parent e7c49d796e7e7043b3f2f8e3e7b274b3ba706756

Fix references to two constants

The names of two constants missed getting updated in a previous CL,
causing a build breakage.

Change-Id: I4853b8647c69bf2b12de43dc8a67fca75822fb14

src/com/android/providers/contacts/CallLogProvider.java

diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
index 6a05e3d..7295dc4 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -75,8 +75,8 @@
         sCallsProjectionMap.put(Calls.DATE, Calls.DATE);
         sCallsProjectionMap.put(Calls.DURATION, Calls.DURATION);
         sCallsProjectionMap.put(Calls.TYPE, Calls.TYPE);
-        sCallsProjectionMap.put(Calls.ACCOUNT_COMPONENT_NAME, Calls.ACCOUNT_COMPONENT_NAME);
-        sCallsProjectionMap.put(Calls.ACCOUNT_ID, Calls.ACCOUNT_ID);
+        sCallsProjectionMap.put(Calls.PHONE_ACCOUNT_COMPONENT_NAME, Calls.PHONE_ACCOUNT_COMPONENT_NAME);
+        sCallsProjectionMap.put(Calls.PHONE_ACCOUNT_ID, Calls.PHONE_ACCOUNT_ID);
         sCallsProjectionMap.put(Calls.NEW, Calls.NEW);
         sCallsProjectionMap.put(Calls.VOICEMAIL_URI, Calls.VOICEMAIL_URI);
         sCallsProjectionMap.put(Calls.IS_READ, Calls.IS_READ);

src/com/android/providers/contacts/ContactsDatabaseHelper.java

diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index fe5e312..b7f16bb 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -1466,8 +1466,8 @@
                 Calls.DATE + " INTEGER," +
                 Calls.DURATION + " INTEGER," +
                 Calls.TYPE + " INTEGER," +
-                Calls.ACCOUNT_COMPONENT_NAME + " TEXT," +
-                Calls.ACCOUNT_ID + " TEXT," +
+                Calls.PHONE_ACCOUNT_COMPONENT_NAME + " TEXT," +
+                Calls.PHONE_ACCOUNT_ID + " TEXT," +
                 Calls.NEW + " INTEGER," +
                 Calls.CACHED_NAME + " TEXT," +
                 Calls.CACHED_NUMBER_TYPE + " INTEGER," +
@@ -4057,8 +4057,8 @@
 
     private void upgradeToVersion902(SQLiteDatabase db) {
         // 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;");
+        db.execSQL("ALTER TABLE calls ADD "+ Calls.PHONE_ACCOUNT_COMPONENT_NAME + " TEXT;");
+        db.execSQL("ALTER TABLE calls ADD "+ Calls.PHONE_ACCOUNT_ID + " TEXT;");
     }
 
     /**

tests/src/com/android/providers/contacts/CallLogProviderTest.java

diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
index 8c6719f..f0540ee 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -202,8 +202,8 @@
         values.put(Calls.CACHED_NUMBER_LABEL, "Directory");
         values.put(Calls.COUNTRY_ISO, "us");
         values.put(Calls.GEOCODED_LOCATION, "usa");
-        values.put(Calls.ACCOUNT_COMPONENT_NAME, "com.android.telecomm/TelecommServiceImpl");
-        values.put(Calls.ACCOUNT_ID, "sub0");
+        values.put(Calls.PHONE_ACCOUNT_COMPONENT_NAME, "com.android.telecomm/TelecommServiceImpl");
+        values.put(Calls.PHONE_ACCOUNT_ID, "sub0");
         assertStoredValues(uri, values);
     }