summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorJerome Poichet <jpoichet@google.com>2014-06-08 21:50:05 -0700
committerJerome Poichet <jpoichet@google.com>2014-06-08 21:50:46 -0700
commitefc3c465cf57726981b87b5d9bbfe894eda1d453 (patch)
treee3e44dbf79ee49907c1d58f309ee53e37461a26e /packages/SettingsProvider
parent2386bd5de40849bd312482e33105070cf438011d (diff)
downloadframeworks_base-efc3c465cf57726981b87b5d9bbfe894eda1d453.zip
frameworks_base-efc3c465cf57726981b87b5d9bbfe894eda1d453.tar.gz
frameworks_base-efc3c465cf57726981b87b5d9bbfe894eda1d453.tar.bz2
Using Manufacturer and not brand for device name
We are aware that there will be some devices out there using brand but we are OK with this. b/15478133 Build.MANUFACTURER is all lower case Change-Id: Iecf8bc8777f21341abfaad1623c9da93ee159520
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 286921e..81a1b94 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2448,7 +2448,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
}
private String getDefaultDeviceName() {
- return mContext.getResources().getString(R.string.def_device_name, Build.BRAND,
+ return mContext.getResources().getString(R.string.def_device_name, Build.MANUFACTURER,
Build.MODEL);
}
}