Bug 732572: Fix the restarter to not have excludeFromRecents. [r=mfinkle]
authorSriram Ramasubramanian <sriram@mozilla.com>
Wed, 16 May 2012 15:24:43 -0700
changeset 94145 1c2c14d8be7821842208ce8d959c9f5cd21aa1a0
parent 94144 0f7d47f6b6dde7e7e687300794330dc638e4965d
child 94146 c462ef73a65fa17fb49d7bbccaa9294698fe7b68
push id9494
push usersramasubramanian@mozilla.com
push dateWed, 16 May 2012 22:29:44 +0000
treeherdermozilla-inbound@c462ef73a65f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs732572
milestone15.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 732572: Fix the restarter to not have excludeFromRecents. [r=mfinkle]
mobile/android/base/AndroidManifest.xml.in
mobile/android/base/Restarter.java.in
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -121,18 +121,17 @@
                   android:permission="@ANDROID_PACKAGE_NAME@.permissions.PASSWORD_PROVIDER">
             <intent-filter>
                   <action android:name="org.mozilla.gecko.INIT_PW"></action>
             </intent-filter>
         </receiver>
 
         <activity android:name="Restarter"
                   android:process="@ANDROID_PACKAGE_NAME@Restarter"
-                  android:theme="@style/Gecko"
-                  android:excludeFromRecents="true">
+                  android:theme="@style/Gecko">
           <intent-filter>
             <action android:name="org.mozilla.gecko.restart"/>
             <action android:name="org.mozilla.gecko.restart_update"/>
           </intent-filter>
         </activity>
 
 #include ../sync/manifests/SyncAndroidManifest_activities.xml.in
 
--- a/mobile/android/base/Restarter.java.in
+++ b/mobile/android/base/Restarter.java.in
@@ -80,16 +80,17 @@ public class Restarter extends Activity 
 
             Intent intent = new Intent(action);
             intent.setClassName("@ANDROID_PACKAGE_NAME@",
                                 "@ANDROID_PACKAGE_NAME@.App");
             Bundle b = getIntent().getExtras();
             if (b != null)
                 intent.putExtras(b);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             Log.i(LOGTAG, intent.toString());
             startActivity(intent);
         } catch (Exception e) {
             Log.i(LOGTAG, e.toString());
         }
         // Give the new process time to start before we die
         GeckoAppShell.waitForAnotherGeckoProc();
         System.exit(0);