Add strict mode exception to addPreferencesFromResource calls

chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..dde83e5995becd0c64226313e4f71d465869acab
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java
@@ -0,0 +1,31 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.preferences;
+
+import android.os.StrictMode;
+import android.preference.PreferenceFragment;
+import android.support.annotation.XmlRes;
+
+/**
+ * A helper class for Preferences.
+ */
+public class PreferenceUtils {
+    /**
+     * A helper that is used to load preferences from XML resources without causing a
+     * StrictModeViolation. See http://crbug.com/692125.
+     *
+     * @param preferenceFragment A PreferenceFragment.
+     * @param preferencesResId   The id of the XML resource to add to the PreferenceFragment.
+     */
+    public static void addPreferencesFromResource(
+            PreferenceFragment preferenceFragment, @XmlRes int preferencesResId) {
+        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+        try {
+            preferenceFragment.addPreferencesFromResource(preferencesResId);
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
+        }
+    }
+}