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

Commit fc48c6a7 authored by Tingting Wang's avatar Tingting Wang Committed by android-build-merger
Browse files

Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 75212992 am: 2fc6bf39 

am: c8242b22

* commit 'c8242b22':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: I5032c5f617e9c4b04893bfd124e6b38196d3dc8e
parents e39cd3d7 c8242b22

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32430,7 +32430,7 @@ package android.provider { 
    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 BOOT_COUNT = "boot_count";

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

    field public static final java.lang.String CONTACT_METADATA_SYNC_ENABLED = "contact_metadata_sync_enabled";

    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/removed.txt

+4 −0
Original line number Diff line number Diff line
@@ -387,6 +387,10 @@ package android.provider { 
    field public static final deprecated java.lang.String TIMESTAMP = "timestamp";

  }



  public static final class Settings.Global extends android.provider.Settings.NameValueTable {

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

  }



  public static final class Settings.System extends android.provider.Settings.NameValueTable {

    field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible";

    field public static final java.lang.String VOLUME_ALARM = "volume_alarm";

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -35129,7 +35129,7 @@ package android.provider { 
    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 BOOT_COUNT = "boot_count";

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

    field public static final java.lang.String CONTACT_METADATA_SYNC_ENABLED = "contact_metadata_sync_enabled";

    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-removed.txt

+4 −0
Original line number Diff line number Diff line
@@ -385,6 +385,10 @@ package android.provider { 
    field public static final deprecated java.lang.String TIMESTAMP = "timestamp";

  }



  public static final class Settings.Global extends android.provider.Settings.NameValueTable {

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

  }



  public static final class Settings.System extends android.provider.Settings.NameValueTable {

    field public static final java.lang.String APPEND_FOR_LAST_AUDIBLE = "_last_audible";

    field public static final java.lang.String VOLUME_ALARM = "volume_alarm";

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32503,7 +32503,7 @@ package android.provider { 
    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 BOOT_COUNT = "boot_count";

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

    field public static final java.lang.String CONTACT_METADATA_SYNC_ENABLED = "contact_metadata_sync_enabled";

    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";