Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1ad40a96: Merge "Fix boot loop when deriving device name." into lmp-dev

Browse Source 
* commit '1ad40a966096c277123cf3d15a4ccdb2cd8af566':
  Fix boot loop when deriving device name.
This commit is contained in:
Jeff Sharkey
2014-09-12 23:13:42 +00:00
committed by Android Git Automerger
parent 620a5ffdd7 c713bf79dd
commit df1bbf4d38
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -193,11 +193,11 @@
<!-- Default for Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, 1==on -->
<integer name="def_heads_up_enabled">1</integer>
<!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
<string name="def_device_name">%1$s</string>
<!-- Default for Settings.Global.DEVICE_NAME $1=MANUFACTURER $2=MODEL-->
<string name="def_device_name_old">%1$s %2$s</string>
<string name="def_device_name">%1$s %2$s</string>
<!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
<string name="def_device_name_simple">%1$s</string>
<!-- Default for Settings.Secure.WAKE_GESTURE_ENABLED -->
<bool name="def_wake_gesture_enabled">true</bool>

4
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -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);
}
}