bug 616078 - Make sure we have a new process for android restarter r=mwu a=blocking-fennec
authorBrad Lassey <blassey@mozilla.com>
Thu, 02 Dec 2010 11:46:22 -0500
changeset 58498 5a50b85ca5ef9163d53058c4a428d99c7f5fc203
parent 58497 cb69605b40287d405828396a288a8424e88b4379
child 58499 50d50f78926501d6c86434eec29c54928f02c08d
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersmwu, blocking-fennec
bugs616078
milestone2.0b8pre
bug 616078 - Make sure we have a new process for android restarter r=mwu a=blocking-fennec
embedding/android/AndroidManifest.xml.in
embedding/android/CrashReporter.java.in
embedding/android/GeckoApp.java
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -77,17 +77,16 @@
           <intent-filter>
             <action android:name="org.mozilla.gecko.restart@MOZ_APP_NAME@" 
 		    android:process="@MOZ_APP_NAME@Restarter"/>
           </intent-filter>
         </activity>
 #if MOZ_CRASHREPORTER
 	<activity android:name="CrashReporter"
                   android:label="@MOZ_APP_DISPLAYNAME@ Crash Reporter"
-		  android:icon="@drawable/crash_reporter"
-		  android:process="org.mozilla.@MOZ_APP_NAME@.crashReporter" >
+		  android:icon="@drawable/crash_reporter" >
           <intent-filter>
             <action android:name="org.mozilla.gecko.reportCrash" />
           </intent-filter>
 	</activity>
 #endif
     </application>
 </manifest> 
--- a/embedding/android/CrashReporter.java.in
+++ b/embedding/android/CrashReporter.java.in
@@ -292,17 +292,16 @@ public class CrashReporter extends Activ
 
   void doRestart()
   {
     try {
       String action = "android.intent.action.MAIN";
       Intent intent = new Intent(action);
       intent.setClassName("org.mozilla.@MOZ_APP_NAME@",
                           "org.mozilla.@MOZ_APP_NAME@.App");
-      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
       Log.i("GeckoCrashReporter", intent.toString());
       startActivity(intent);
     } catch (Exception e) {
       Log.e("GeckoCrashReporter", "error while trying to restart", e);
     }
   }
 
   public String unescape(String string)
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -532,17 +532,18 @@ abstract public class GeckoApp
 
     public void doRestart() {
         try {
             String action = "org.mozilla.gecko.restart" + getAppName();
             Intent intent = new Intent(action);
             intent.setClassName("org.mozilla." + getAppName(),
                                 "org.mozilla." + getAppName() + ".Restarter");
             addEnvToIntent(intent);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
+                            Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
             Log.i("GeckoAppJava", intent.toString());
             startActivity(intent);
         } catch (Exception e) {
             Log.i("GeckoAppJava", e.toString());
         }
         finish();
     }