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

Commit 7d92d5af authored by Tom O'Neill's avatar Tom O'Neill
Browse files

Revert a couple of deprecations to fix broken build 

Will re-deprecate in a subsequent CL

Change-Id: Ibc246e2e26a68880f3fba3aff3407404f5a57ce3
parent 0f26ec1a

core/java/android/provider/ContactsContract.java

+2 −4
Original line number Diff line number Diff line
@@ -1466,9 +1466,8 @@ public final class ContactsContract { 
        /**

         * Do not use.

         *

         * @deprecated in favor of {@link #AGGREGATION_MODE_DEFAULT}

         * TODO: deprecate in favor of {@link #AGGREGATION_MODE_DEFAULT}

         */

        @Deprecated

        public static final int AGGREGATION_MODE_IMMEDIATE = 1;



        /**
@@ -1538,9 +1537,8 @@ public final class ContactsContract { 
         * {@link ContactsContract.Data} rows. To access this directory

         * append {@link Data#CONTENT_DIRECTORY} to the contact URI.

         *

         * @deprecated in favor of {@link RawContacts.Entity}.

         * TODO: deprecate in favor of {@link RawContacts.Entity}.

         */

        @Deprecated

        public static final class Data implements BaseColumns, DataColumns {

            /**

             * no public constructor since this is a utility class