diff options
| author | Jerome Poichet <jpoichet@google.com> | 2014-06-09 19:29:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 19:29:23 +0000 |
| commit | 7fc1e221509864b2d1014a9ad804f71ec15d9a49 (patch) | |
| tree | 6f88e0b4235f4704f441b0bc828d1a965b9ac38c /packages/SettingsProvider/src/com/android/providers/settings | |
| parent | 9aea9c93c531e0649e40f60692f775d45cc01f69 (diff) | |
| parent | cbe8e35bdae44e406476550e7c478b46931696d1 (diff) | |
| download | frameworks_base-7fc1e221509864b2d1014a9ad804f71ec15d9a49.zip frameworks_base-7fc1e221509864b2d1014a9ad804f71ec15d9a49.tar.gz frameworks_base-7fc1e221509864b2d1014a9ad804f71ec15d9a49.tar.bz2 | |
am 576563c3: Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev
* commit '576563c3d37ba58bc94e87aa385d92dc79498003':
Using Manufacturer and not brand for device name
Diffstat (limited to 'packages/SettingsProvider/src/com/android/providers/settings')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 2 |
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 c4a54b7..9b21ae4 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2468,7 +2468,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); } } |