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

Commit 89858c58 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by android-build-merger
Browse files

Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev 

am: b1ca092d

Change-Id: Icdb1cef5802c4d2b22292874ab3139a132fe7bd0
parents 43fc5fbd b1ca092d

api/current.txt

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

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

    field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";

    field public static final java.lang.String DEVICE_NAME = "device_name";

    field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String HTTP_PROXY = "http_proxy";

    field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

api/system-current.txt

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

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

    field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";

    field public static final java.lang.String DEVICE_NAME = "device_name";

    field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String HTTP_PROXY = "http_proxy";

    field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

api/test-current.txt

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

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

    field public static final java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";

    field public static final java.lang.String DEVICE_NAME = "device_name";

    field public static final java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String HTTP_PROXY = "http_proxy";

    field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

core/java/android/provider/Settings.java

+0 −2
Original line number Diff line number Diff line
@@ -8507,8 +8507,6 @@ public final class Settings { 


        /**

         * The name of the device

         *

         * @hide

         */

        public static final String DEVICE_NAME = "device_name";