commit 34ea500bee5828f1dbd0e19d31d91aa1e979382a
author Nancy Chen <nancychen@google.com> Thu Aug 28 17:56:05 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 28 17:56:06 2014 +0000
tree d5cce4505f90c2a4e652165adbbeb9a28e483da2
parent ec9680853b8526568a96805e38af77f3c6da175a
parent dcf33302ccef41224e40623d72943a295f211b02

Merge "Handle db upgrade for non-Sprout devices to match Sprout devices." into lmp-dev

res/values-km-rKH/strings.xml

diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 62a1987..cbaa2f9 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -29,7 +29,7 @@
     <string name="debug_dump_title" msgid="4916885724165570279">"ចម្លង​មូលដ្ឋាន​ទិន្នន័យ​ទំនាក់ទំនង"</string>
     <string name="debug_dump_database_message" msgid="406438635002392290">"អ្នក​ហៀបនឹង ១) ចម្លង​មូលដ្ឋាន​ទិន្នន័យ​របស់​អ្នក​ដែល​រួម​មាន​ព័ត៌មាន​ទំនាក់ទំនង និង​កំណត់ហេតុ​ហៅ​ទាំងអស់​ទៅកាន់​ឧបករណ៍​ផ្ទុក​ខាងក្នុង ២) ផ្ញើ​អ៊ី​ម៉ែ​ល​វា​។ ចងចាំ​ថា​អ្នក​ត្រូវ​លុប​ច្បាប់​ចម្លង​ភ្លាមៗ បន្ទាប់ពី​បាន​ចម្លង​ចេញពី​ឧបករណ៍ ឬ​បាន​ទទួល​អ៊ីមែល។"</string>
     <string name="debug_dump_delete_button" msgid="7832879421132026435">"លុប​ឥឡូវ"</string>
-    <string name="debug_dump_start_button" msgid="2837506913757600001">"ចាប់ផ្ដើម"</string>
+    <string name="debug_dump_start_button" msgid="2837506913757600001">"ចាប់ផ្ដើម​"</string>
     <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"ជ្រើស​កម្មវិធី​ដើម្បី​ផ្ញើ​ឯកសារ​របស់​អ្នក"</string>
     <string name="debug_dump_email_subject" msgid="108188398416385976">"បាន​ភ្ជាប់​មូលដ្ឋាន​ទិន្នន័យ​ទំនាក់ទំនង"</string>
     <string name="debug_dump_email_body" msgid="4577749800871444318">"ឯកសារ​ភ្ជាប់​គឺជា​មូលដ្ឋាន​ទិន្នន័យ​ទំនាក់ទំនង​ព្រមទាំង​ព័ត៌មាន​ទំនាក់ទំនង​ទាំង​អស់​របស់​ខ្ញុំ។ ប្រើ​វា​ដោយ​ប្រុងប្រយ័ត្ន។"</string>

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

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 2affd69..a558923 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -6583,7 +6583,7 @@
                         builder.add(getCorpDisplayPhotoUri(contactId, original));
                         break;
                     case PhoneLookup._ID:
-                        builder.add(original.getLong(i) + Contacts.CORP_CONTACT_ID_BASE);
+                        builder.add(original.getLong(i) + Contacts.ENTERPRISE_CONTACT_ID_BASE);
                         break;
 
                     // These columns are set to null.

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

diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index e55ebcb..11d9b57 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -19,7 +19,6 @@
 import static com.android.providers.contacts.TestUtils.cv;
 
 import android.accounts.Account;
-import android.content.ContentProvider;
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
 import android.content.ContentResolver;
@@ -69,7 +68,6 @@
 import android.provider.OpenableColumns;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.Suppress;
 import android.text.TextUtils;
 
 import com.android.internal.util.ArrayUtils;
@@ -1769,7 +1767,7 @@
             assertEquals(1, c.getCount());
             c.moveToPosition(0);
             long contactId = c.getLong(c.getColumnIndex(PhoneLookup._ID));
-            assertFalse(Contacts.isCorpContactId(contactId)); // Make sure it's not rewritten.
+            assertFalse(Contacts.isEnterpriseContactId(contactId)); // Make sure it's not rewritten.
         } finally {
             c.close();
         }
@@ -1861,7 +1859,7 @@
 
             // Make sure it has a personal contact ID.
             long contactId = c.getLong(c.getColumnIndex(PhoneLookup._ID));
-            assertFalse(Contacts.isCorpContactId(contactId));
+            assertFalse(Contacts.isEnterpriseContactId(contactId));
         } finally {
             c.close();
         }
@@ -1878,7 +1876,7 @@
 
             // Make sure it has a corp contact ID.
             long contactId = c.getLong(c.getColumnIndex(PhoneLookup._ID));
-            assertTrue(Contacts.isCorpContactId(contactId));
+            assertTrue(Contacts.isEnterpriseContactId(contactId));
         } finally {
             c.close();
         }
@@ -8545,6 +8543,30 @@
         );
     }
 
+    /**
+     * Tests the functionality of the
+     * {@link ContactsContract.PinnedPositions#pin(ContentResolver, long, int)} API.
+     */
+    public void testPinnedPositions_ContactsContractPinnedPositionsPin() {
+        final DatabaseAsserts.ContactIdPair i1 = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        assertStoredValuesWithProjection(Contacts.CONTENT_URI,
+                cv(Contacts._ID, i1.mContactId, Contacts.PINNED, PinnedPositions.UNPINNED)
+        );
+
+        ContactsContract.PinnedPositions.pin(mResolver,  i1.mContactId, 5);
+
+        assertStoredValuesWithProjection(Contacts.CONTENT_URI,
+                cv(Contacts._ID, i1.mContactId, Contacts.PINNED, 5)
+        );
+
+        ContactsContract.PinnedPositions.pin(mResolver,  i1.mContactId, PinnedPositions.UNPINNED);
+
+        assertStoredValuesWithProjection(Contacts.CONTENT_URI,
+                cv(Contacts._ID, i1.mContactId, Contacts.PINNED, PinnedPositions.UNPINNED)
+        );
+    }
+
     private ContentProviderOperation newPinningOperation(long id, int pinned, boolean star) {
         final Uri uri = Uri.withAppendedPath(Contacts.CONTENT_URI, String.valueOf(id));
         final ContentValues values = new ContentValues();