Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acaf6864 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am ff650115: am e120d1e5: am c8f3ac84: Merge "Update the value of... 

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

* commit 'ff65011576f13cd28cafe6a83098b18bf66344db':
  Update the value of PinnedPositions.UNPINNED to 0
parents e12a1259 09002ed8

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -24848,7 +24848,7 @@ package android.provider { 
    ctor public ContactsContract.PinnedPositions();

    ctor public ContactsContract.PinnedPositions();

    field public static final int DEMOTED = -1; // 0xffffffff

    field public static final int DEMOTED = -1; // 0xffffffff

    field public static final java.lang.String UNDEMOTE_METHOD = "undemote";

    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 {







  public static final deprecated class ContactsContract.Presence extends android.provider.ContactsContract.StatusUpdates {

























core/java/android/provider/ContactsContract.java



+4
−6






























Original line number
Original line
Diff line number
Diff line








@@ -8033,9 +8033,8 @@ public final class ContactsContract {









     *







     *











     * <p>







     * <p>











     * By default, unpinned contacts will have a pinned position of







     * By default, unpinned contacts will have a pinned position of











     * {@link PinnedPositions#UNPINNED}, or {@link Integer#MAX_VALUE} (2^31 - 1). Client-provided







     * {@link PinnedPositions#UNPINNED}. Client-provided pinned positions can be positive











     * pinned positions can be positive integers that range anywhere from 0 to







     * integers that are greater than 1.











     * {@link PinnedPositions#UNPINNED}.














     * </p>







     * </p>











     */







     */











    public static final class PinnedPositions {







    public static final class PinnedPositions {









@@ -8058,10 +8057,9 @@ public final class ContactsContract {









        public static final String UNDEMOTE_METHOD = "undemote";







        public static final String UNDEMOTE_METHOD = "undemote";































        /**







        /**











         * Default value for the pinned position of an unpinned contact. Also equal to







         * Default value for the pinned position of an unpinned contact. Also equal to 0.











         * {@link Integer#MAX_VALUE}.














         */







         */











        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







         * Value of pinned position for a contact that a user has indicated should be considered