diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-09-12 15:56:30 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2014-09-12 15:56:30 -0700 |
| commit | ad59c43072a3e053eecb2cca831488dc49a3af33 (patch) | |
| tree | 256df37a21f42e73300d5f1b3159111085e0f6aa /packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | |
| parent | 3ad3b4f11a6fd9a740aeebb079291640f47641e6 (diff) | |
| download | frameworks_base-ad59c43072a3e053eecb2cca831488dc49a3af33.zip frameworks_base-ad59c43072a3e053eecb2cca831488dc49a3af33.tar.gz frameworks_base-ad59c43072a3e053eecb2cca831488dc49a3af33.tar.bz2 | |
Fix boot loop when deriving device name.
Bug: 17490408
Change-Id: If1cc25a341eed4e41a7bf170bab077203fa19d15
Diffstat (limited to 'packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index bdb167f..873257c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2609,11 +2609,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { } private String getOldDefaultDeviceName() { - return mContext.getResources().getString(R.string.def_device_name_old, + return mContext.getResources().getString(R.string.def_device_name, Build.MANUFACTURER, Build.MODEL); } private String getDefaultDeviceName() { - return mContext.getResources().getString(R.string.def_device_name, Build.MODEL); + return mContext.getResources().getString(R.string.def_device_name_simple, Build.MODEL); } } |