Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3830)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

Issue 2680013010: Add strict mode exclusion around PreferenceFragment#addPreferencesFromResource (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
index 67d0934d611b749a3246b07e25c7642cae7d3008..49ebed3ffdeff9eda61aa268752b7d959848d87f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
@@ -8,6 +8,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
+import android.os.StrictMode;
import android.preference.Preference;
import android.preference.PreferenceFragment;
@@ -95,7 +96,13 @@ public class MainPreferences extends PreferenceFragment
private void updatePreferences() {
if (getPreferenceScreen() != null) getPreferenceScreen().removeAll();
- addPreferencesFromResource(R.xml.main_preferences);
+
+ StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+ try {
+ addPreferencesFromResource(R.xml.main_preferences);
+ } finally {
+ StrictMode.setThreadPolicy(oldPolicy);
+ }
if (TemplateUrlService.getInstance().isLoaded()) {
updateSummary();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698