From f19b6ec8bb6ef65b889e40572e6eedc16e571a9a Mon Sep 17 00:00:00 2001 From: Dmitri Plotnikov Date: Tue, 21 Jun 2016 16:22:56 -0700 Subject: [PATCH] Unhiding DEVICE_NAME Bug: 28439637 Change-Id: Iea9efbaf18b2110c21f0d27a3e44fd6590f2d372 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/provider/Settings.java | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 1414fab1e464a..238560312fcd3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32477,6 +32477,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"; diff --git a/api/system-current.txt b/api/system-current.txt index cb6ae795f9324..f644731e6769b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -35182,6 +35182,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"; diff --git a/api/test-current.txt b/api/test-current.txt index 970ec19b1b13b..63be87064e899 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -32551,6 +32551,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"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ca45e62acf58e..56085b5633b16 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8507,8 +8507,6 @@ public final class Settings { /** * The name of the device - * - * @hide */ public static final String DEVICE_NAME = "device_name";