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

Commit abcc4392 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 

am: 89858c58

Change-Id: Id7ccc6d627574bb1a1d0198f72ab70f921d8c9d9
parents 81b6d377 89858c58

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32491,6 +32491,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
@@ -35196,6 +35196,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
@@ -32565,6 +32565,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
@@ -8510,8 +8510,6 @@ public final class Settings { 


        /**

         * The name of the device

         *

         * @hide

         */

        public static final String DEVICE_NAME = "device_name";