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

Merge change 2408 into donut

Browse Source 
* changes:
  Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.
This commit is contained in:
Android (Google) Code Review
2009-05-25 00:58:57 -07:00
parent 944ea12368 c27d9b5341
commit 26a892a045
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/WebSettings.java
View File

@@ -123,7 +123,7 @@ public class WebSettings {
private String mSerifFontFamily = "serif";
private String mCursiveFontFamily = "cursive";
private String mFantasyFontFamily = "fantasy";
private String mDefaultTextEncoding = "Latin-1";
private String mDefaultTextEncoding;
private String mUserAgent;
private boolean mUseDefaultUserAgent;
private String mAcceptLanguage;
@@ -240,6 +240,8 @@ public class WebSettings {
WebSettings(Context context) {
mEventHandler = new EventHandler();
mContext = context;
mDefaultTextEncoding = context.getString(com.android.internal.
R.string.default_text_encoding);
if (sLockForLocaleSettings == null) {
sLockForLocaleSettings = new Object();