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

Commit 9d46b3ef authored by Tingting Wang's avatar Tingting Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove @hide for CONTACT_METADATA_SYNC."

parents ad66efa8 e1055217

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31369,6 +31369,7 @@ package android.provider { 
    field public static final java.lang.String AUTO_TIME = "auto_time";

    field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";

    field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";

    field public static final java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync";

    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String DATA_ROAMING = "data_roaming";

    field public static final java.lang.String DEBUG_APP = "debug_app";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33505,6 +33505,7 @@ package android.provider { 
    field public static final java.lang.String AUTO_TIME = "auto_time";

    field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";

    field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";

    field public static final java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync";

    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String DATA_ROAMING = "data_roaming";

    field public static final java.lang.String DEBUG_APP = "debug_app";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31381,6 +31381,7 @@ package android.provider { 
    field public static final java.lang.String AUTO_TIME = "auto_time";

    field public static final java.lang.String AUTO_TIME_ZONE = "auto_time_zone";

    field public static final java.lang.String BLUETOOTH_ON = "bluetooth_on";

    field public static final java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync";

    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String DATA_ROAMING = "data_roaming";

    field public static final java.lang.String DEBUG_APP = "debug_app";

core/java/android/provider/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -8288,7 +8288,6 @@ public final class Settings { 
        /**

         * Whether to enable contacts metadata syncing or not

         * The value 1 - enable, 0 - disable

         * @hide

         */

        public static final String CONTACT_METADATA_SYNC = "contact_metadata_sync";