From 720ec0b6972dbb2587b876f863ca0ca1108aff23 Mon Sep 17 00:00:00 2001 From: Ignacio Solla Date: Wed, 29 Oct 2014 11:10:51 +0000 Subject: [WebView] Remove dependency on Build.IS_DEBUGGABLE. BUG:18152150 Change-Id: If9c8e28f6dd737ae0f677afc89ef5136a8e2268b (cherry picked from commit bf95f761ba3d2dee0ee98b7204d289f35c4f478d) --- .../android/webview/chromium/WebViewChromiumFactoryProvider.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chromium') diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index 840d306..15c8ad5 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java @@ -101,7 +101,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { private SharedPreferences mWebViewPrefs; public WebViewChromiumFactoryProvider() { - if (Build.IS_DEBUGGABLE) { + if (isBuildDebuggable()) { // Suppress the StrictMode violation as this codepath is only hit on debugglable builds. StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads(); CommandLine.initFromFile(COMMAND_LINE_FILE); @@ -151,6 +151,10 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { // Now safe to use WebView data directory. } + private static boolean isBuildDebuggable() { + return !Build.TYPE.equals("user"); + } + private static void deleteContents(File dir) { File[] files = dir.listFiles(); if (files != null) { -- cgit v1.2.3