commit 888cf9f96416b3ee26d24339c966c60415bf99af
author Brian Attwell <brianattwell@google.com> Thu Dec 18 20:09:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 18 20:09:15 2014 +0000
tree b76a3b0bacc159a199c6e394b2a6f75ba4f71f20
parent 2a3bf46d52d50cae159b724ad3d845d8c557a20b
parent 2d88efaf9efa059c70783acffb6ec3055e1b883b

Merge changes Ia92e0619,Ifd0cfc06

* changes:
  Don't reference UNDEMOTE_METHOD
  Don't use internal VisibleForTesting annotation

src/com/android/contacts/ContactSaveService.java

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 7d355cd..ed5b1ff 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -833,8 +833,7 @@
 
                 // Don't bother undemoting if this contact is the user's profile.
                 if (id < Profile.MIN_ID) {
-                    getContentResolver().call(ContactsContract.AUTHORITY_URI,
-                            PinnedPositions.UNDEMOTE_METHOD, String.valueOf(id), null);
+                    PinnedPositions.undemote(getContentResolver(), id);
                 }
             }
         } finally {

src/com/android/contacts/interactions/CallLogInteractionsLoader.java

diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
index c8e26e9..46cd315 100644
--- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
@@ -26,7 +26,7 @@
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
-import com.android.internal.annotations.VisibleForTesting;
+import com.google.common.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
 import java.util.Collections;