diff options
author | Ben Murdoch <benm@google.com> | 2014-08-28 15:43:47 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2014-08-28 15:43:47 +0100 |
commit | 3688d4e395b6ce345514f15304b9c670ed1ab875 (patch) | |
tree | 01698ed07e1a1231e5c9f249f1d9f3520e40b2fe /chromium/java/com | |
parent | 547c79b0621ef5879d01998b8eaa8914a8ef4f13 (diff) | |
download | webview-3688d4e395b6ce345514f15304b9c670ed1ab875.tar.gz |
Cherry pick "StrictMode warning reading command line file."
Cherry pick I659d8b42459bfecc299374b774405e952a74bf2d to
master-chromium.
Change-Id: If30edb8c324dada8ed99da400a5f9c5fab89f938
Diffstat (limited to 'chromium/java/com')
-rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index d24df5c..c688d44 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java @@ -26,6 +26,7 @@ import android.content.SharedPreferences; import android.os.Build; import android.os.FileUtils; import android.os.Looper; +import android.os.StrictMode; import android.os.SystemProperties; import android.os.Trace; import android.util.Log; @@ -99,7 +100,10 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { public WebViewChromiumFactoryProvider() { if (Build.IS_DEBUGGABLE) { + // Suppress the StrictMode violation as this codepath is only hit on debugglable builds. + StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads(); CommandLine.initFromFile(COMMAND_LINE_FILE); + StrictMode.setThreadPolicy(oldPolicy); } else { CommandLine.init(null); } |