Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c8f3ac84: Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev

Browse Source 
* commit 'c8f3ac841b3bb761f8d53db555f3c252370a906f':
  Update the value of PinnedPositions.UNPINNED to 0
This commit is contained in:
Yorke Lee
2014-07-25 21:49:07 +00:00
committed by Android Git Automerger
parent 14d4df06e0 eea3c5d735
commit 6edd156cd9
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -24846,7 +24846,7 @@ package android.provider {
ctor public ContactsContract.PinnedPositions();
field public static final int DEMOTED = -1; // 0xffffffff
field public static final java.lang.String UNDEMOTE_METHOD = "undemote";
field public static final int UNPINNED = 2147483647; // 0x7fffffff
field public static final int UNPINNED = 0; // 0x0
}
public static final deprecated class ContactsContract.Presence extends android.provider.ContactsContract.StatusUpdates {

10
core/java/android/provider/ContactsContract.java
View File

@@ -8033,9 +8033,8 @@ public final class ContactsContract {
*
* <p>
* By default, unpinned contacts will have a pinned position of
* {@link PinnedPositions#UNPINNED}, or {@link Integer#MAX_VALUE} (2^31 - 1). Client-provided
* pinned positions can be positive integers that range anywhere from 0 to
* {@link PinnedPositions#UNPINNED}.
* {@link PinnedPositions#UNPINNED}. Client-provided pinned positions can be positive
* integers that are greater than 1.
* </p>
*/
public static final class PinnedPositions {
@@ -8058,10 +8057,9 @@ public final class ContactsContract {
public static final String UNDEMOTE_METHOD = "undemote";
/**
* Default value for the pinned position of an unpinned contact. Also equal to
* {@link Integer#MAX_VALUE}.
* Default value for the pinned position of an unpinned contact. Also equal to 0.
*/
public static final int UNPINNED = 0x7FFFFFFF;
public static final int UNPINNED = 0;
/**
* Value of pinned position for a contact that a user has indicated should be considered