commit ef749cb6a1709ea411222b3c035bbd9271e87b35
author Tarun Nainani <tnainani@codeaurora.org> Mon May 19 18:16:53 2014 -0700
committer Tarun Nainani <tnainani@codeaurora.org> Wed May 21 13:31:55 2014 -0700
tree 77953a60eb02502a332ddbd0a38ac8cfa45a1035
parent e75909d7f96ab75c64be108f48a9bcc0934ae070

Fixes for 1599-qrd browser to work with 1857 swe engine

Fix provider issue by providing custom class with authority string.
Comment out clear password feature.

Change-Id: Icab6cf7d3bbd71a14fad337ef01f0c53fcaf2fdf

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 1ace9fd..dd17141 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -19,10 +19,8 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.KeyguardManager;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
@@ -46,19 +44,15 @@
 import com.android.browser.search.SearchEngine;
 import com.android.browser.stub.NullController;
 
-import org.chromium.content.browser.TracingIntentHandler;
 import org.codeaurora.swe.WebSettings;
 import org.codeaurora.swe.WebView;
+import org.chromium.content.browser.TracingControllerAndroid;
 
 public class BrowserActivity extends Activity {
 
     public static final String ACTION_SHOW_BOOKMARKS = "show_bookmarks";
     public static final String ACTION_SHOW_BROWSER = "show_browser";
     public static final String ACTION_RESTART = "--restart--";
-    private static final String ACTION_START_TRACE =
-            "org.chromium.content_shell.action.PROFILE_START";
-    private static final String ACTION_STOP_TRACE =
-            "org.chromium.content_shell.action.PROFILE_STOP";
     private static final String EXTRA_STATE = "state";
     public static final String EXTRA_DISABLE_URL_OVERRIDE = "disable_url_override";
 
@@ -67,6 +61,7 @@
     private final static boolean LOGV_ENABLED = Browser.LOGV_ENABLED;
 
     private ActivityController mController = NullController.INSTANCE;
+    private TracingControllerAndroid mTracingController;
 
 
     private Handler mHandler = new Handler();
@@ -85,8 +80,12 @@
         }
     };
 
-    private BroadcastReceiver mReceiver;
-
+    private TracingControllerAndroid getTracingController() {
+        if (mTracingController == null) {
+            mTracingController = new TracingControllerAndroid(this);
+        }
+        return mTracingController;
+    }
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -185,27 +184,8 @@
             Log.v(LOGTAG, "BrowserActivity.onResume: this=" + this);
         }
         mController.onResume();
-        IntentFilter intentFilter = new IntentFilter(ACTION_START_TRACE);
-        intentFilter.addAction(ACTION_STOP_TRACE);
-        mReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                String action = intent.getAction();
-                String extra = intent.getStringExtra("file");
-                if (ACTION_START_TRACE.equals(action)) {
-                    if (extra.isEmpty()) {
-                        Log.e(LOGTAG, "Can not start tracing without specifing saving location");
-                    } else {
-                        TracingIntentHandler.beginTracing(extra);
-                        Log.i(LOGTAG, "start tracing");
-                    }
-                } else if (ACTION_STOP_TRACE.equals(action)) {
-                    Log.i(LOGTAG, "stop tracing");
-                    TracingIntentHandler.endTracing();
-                }
-            }
-        };
-        registerReceiver(mReceiver, intentFilter);
+
+        getTracingController().registerReceiver(this);
     }
 
     @Override
@@ -244,6 +224,7 @@
     protected void onPause() {
         mController.onPause();
         super.onPause();
+        getTracingController().unregisterReceiver(this);
     }
 
     @Override