[WebView] Remove dependency on Build.IS_DEBUGGABLE.

BUG:18152150
Change-Id: If9c8e28f6dd737ae0f677afc89ef5136a8e2268b

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 cbeead5..8043ad8 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -99,7 +99,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);
@@ -142,6 +142,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) {