chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java - Issue 2787323002: Add strict mode exception to addPreferencesFromResource calls

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2787323002: Add strict mode exception to addPreferencesFromResource calls (Closed)

Patch Set: rename helper to util Created 3 years, 9 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 | « chrome/android/java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 49ebed3ffdeff9eda61aa268752b7d959848d87f..e302d1fa569d071a5e6a19ffcb52ea4b2d77d7ba 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,7 +8,6 @@ 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;

@@ -97,12 +96,7 @@ public class MainPreferences extends PreferenceFragment

private void updatePreferences() {

if (getPreferenceScreen() != null) getPreferenceScreen().removeAll();

- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();

- try {

- addPreferencesFromResource(R.xml.main_preferences);

- } finally {

- StrictMode.setThreadPolicy(oldPolicy);

- }

+ PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences);

if (TemplateUrlService.getInstance().isLoaded()) {

updateSummary();