diff options
author | Ignacio Solla <igsolla@google.com> | 2014-10-29 11:10:51 +0000 |
---|---|---|
committer | Ignacio Solla Paula <igsolla@google.com> | 2014-11-12 23:48:16 +0000 |
commit | 720ec0b6972dbb2587b876f863ca0ca1108aff23 (patch) | |
tree | 7b2376ab5b6dd581a950f1773d8179998def8043 /chromium/java/com | |
parent | 8ae9c440cb8835fd8d95c51674b11b3857fc6885 (diff) | |
download | webview-720ec0b6972dbb2587b876f863ca0ca1108aff23.tar.gz |
[WebView] Remove dependency on Build.IS_DEBUGGABLE.
BUG:18152150
Change-Id: If9c8e28f6dd737ae0f677afc89ef5136a8e2268b
(cherry picked from commit bf95f761ba3d2dee0ee98b7204d289f35c4f478d)
Diffstat (limited to 'chromium/java/com')
-rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java | 6 |
1 files changed, 5 insertions, 1 deletions
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) { |