commit aac0e66fb100b329d6010637998849048efadca9
author Wenyi Wang <wenyiw@google.com> Fri Dec 18 17:17:33 2015 -0800
committer Wenyi Wang <wenyiw@google.com> Fri Dec 18 18:11:25 2015 -0800
tree 19119f94554d1c3a2074f02d34cddc4838c2654c
parent 4c3d3e24b0de8b4170106e312f6a4ac8139e1242

Backport ContactsContract.PinnedPositions and create compat package

This class was unhidden in API level 21 and the undemote method was
added in API level 21 as well.

Bug: 25629359
Change-Id: I7eecd28338a8f14fca7b8249599c3f7eac70442c

src/com/android/contacts/ContactSaveService.java

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 0bc80e7..c3a7f24 100755
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -42,7 +42,6 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Groups;
-import android.provider.ContactsContract.PinnedPositions;
 import android.provider.ContactsContract.Profile;
 import android.provider.ContactsContract.RawContacts;
 import android.provider.ContactsContract.RawContactsEntity;
@@ -59,6 +58,7 @@
 import com.android.contacts.common.model.RawContactModifier;
 import com.android.contacts.common.model.account.AccountWithDataSet;
 import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.compat.PinnedPositionsCompat;
 import com.android.contacts.util.ContactPhotoUtils;
 
 import com.google.common.collect.Lists;
@@ -952,7 +952,7 @@
 
                 // Don't bother undemoting if this contact is the user's profile.
                 if (id < Profile.MIN_ID) {
-                    PinnedPositions.undemote(getContentResolver(), id);
+                    PinnedPositionsCompat.undemote(getContentResolver(), id);
                 }
             }
         } finally {