commit 0989b45c12b64b28750c9df1389c6003aa0d1d65
author Vivek Sekhar <vsekhar@codeaurora.org> Fri Aug 01 12:30:35 2014 -0700
committer WebTech Code Review <code-review@localhost> Tue Aug 05 15:16:10 2014 -0700
tree 3689a2d8adc395474aacc8d2eec657df5c0bd528
parent 10daf89d192c9da985e380524f13bdaa562d51f6

Browser Fixes.

- Move the browser targeted verion to SDK 19.
- Remove hack to create dummy webview to call into
  singleton classes and use Engine class.
- Add missing methods to compile for API 19.

Change-Id: Ie765921f1227eb5de314ed29c5ce909bee6aea93

src/com/android/browser/Browser.java

diff --git a/src/com/android/browser/Browser.java b/src/com/android/browser/Browser.java
index 5428494..01b9706 100644
--- a/src/com/android/browser/Browser.java
+++ b/src/com/android/browser/Browser.java
@@ -22,7 +22,7 @@
 import android.util.Log;
 import android.os.Process;
 
-import org.codeaurora.swe.CookieSyncManager;
+import org.codeaurora.swe.Engine;
 
 import com.android.browser.BrowserConfig;
 
@@ -45,16 +45,16 @@
 
         // 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 +
+        final String INITIALIZE_DATABASE = BrowserConfig.AUTHORITY +
                                             ".permission.INITIALIZE_DATABASE";
         final Context context = getApplicationContext();
-        if (context.checkPermission(INITIALIZE_DATABASE,
-              Process.myPid(), Process.myUid()) == PackageManager.PERMISSION_GRANTED) {
-
-                // create CookieSyncManager with current Context
-                CookieSyncManager.createInstance(this);
-                BrowserSettings.initialize(getApplicationContext());
-                Preloader.initialize(getApplicationContext());
+        boolean isActivityContext = (context.checkPermission(INITIALIZE_DATABASE,
+              Process.myPid(), Process.myUid()) == PackageManager.PERMISSION_GRANTED);
+        if (isActivityContext) {
+            // Initialize the SWE engine.
+            Engine.initialize(context);
+            BrowserSettings.initialize(context);
+            Preloader.initialize(context);
         }
     }
 }