commit 1c4d6b80bf174cf4785d28288c68dd5447a178c5
author Enrico Ros <eros@codeaurora.org> Tue Oct 14 16:23:17 2014 -0700
committer WebTech Code Review <code-review@localhost> Thu Oct 16 16:27:12 2014 -0700
tree 7f4fad9e6b6edb08127e9d130d170b2243856d4a
parent 752ce5930a447ee7afe27e16136aceb90533603c

Fix crash due to a false positive in sandboxed-process identification.

Fixes crash on HTC One M8 (and potentially other devices).

Change-Id: Iee60c6b193b844bf1e075adb87b4be4d63e15d58

src/com/android/browser/Browser.java

diff --git a/src/com/android/browser/Browser.java b/src/com/android/browser/Browser.java
index f042eab..34facf7 100644
--- a/src/com/android/browser/Browser.java
+++ b/src/com/android/browser/Browser.java
@@ -16,19 +16,15 @@
 
 package com.android.browser;
 
+import android.Manifest;
 import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.util.Log;
 import android.os.Process;
-
-import org.chromium.content.browser.ResourceExtractor;
-import org.chromium.base.PathUtils;
+import android.util.Log;
 
 import org.codeaurora.swe.Engine;
 
-import com.android.browser.BrowserConfig;
-
 public class Browser extends Application {
 
     private final static String LOGTAG = "browser";
@@ -42,24 +38,24 @@
     @Override
     public void onCreate() {
         super.onCreate();
+
         if (LOGV_ENABLED)
             Log.v(LOGTAG, "Browser.onCreate: this=" + this);
 
-        // SWE: Avoid initializing databases for sandboxed processes.
-        // Must have INITIALIZE_DATABASE permission in AndroidManifest.xml only for browser process
-        final String INITIALIZE_DATABASE = BrowserConfig.AUTHORITY +
-                                            ".permission.INITIALIZE_DATABASE";
-        final Context context = getApplicationContext();
-        //Chromium specific initialization.
+        // Chromium specific initialization.
         Engine.initializeApplicationParameters();
-        boolean isActivityContext = (context.checkPermission(INITIALIZE_DATABASE,
-              Process.myPid(), Process.myUid()) == PackageManager.PERMISSION_GRANTED);
-        if (isActivityContext) {
+
+        final boolean isSandboxContext = checkPermission(Manifest.permission.INTERNET,
+                Process.myPid(), Process.myUid()) != PackageManager.PERMISSION_GRANTED;
+
+        if (isSandboxContext) {
+            // SWE: Avoid initializing the engine for sandboxed processes.
+        } else {
             // Initialize the SWE engine.
-            Engine.initialize(context);
-            BrowserSettings.initialize(context);
-            Preloader.initialize(context);
-       }
+            Engine.initialize((Context) this);
+            BrowserSettings.initialize((Context) this);
+            Preloader.initialize((Context) this);
+        }
 
     }
 }