From ad59c43072a3e053eecb2cca831488dc49a3af33 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 12 Sep 2014 15:56:30 -0700
Subject: Fix boot loop when deriving device name.

Bug: 17490408
Change-Id: If1cc25a341eed4e41a7bf170bab077203fa19d15
---
 .../src/com/android/providers/settings/DatabaseHelper.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java')

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);
     }
 }
-- 
cgit v1.1