corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 616078 - Make sure we have a new process for android restarter r=mwu a=blocking-fennec

Browse Source
This commit is contained in:
Brad Lassey
2010-12-02 11:46:22 -05:00
parent 3eae1d464d
commit b319d08428
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
embedding/android/AndroidManifest.xml.in
View File

@@ -82,8 +82,7 @@
#if MOZ_CRASHREPORTER #if MOZ_CRASHREPORTER
<activity android:name="CrashReporter" <activity android:name="CrashReporter"
android:label="@MOZ_APP_DISPLAYNAME@ Crash Reporter" android:label="@MOZ_APP_DISPLAYNAME@ Crash Reporter"
android:icon="@drawable/crash_reporter" android:icon="@drawable/crash_reporter" >
android:process="org.mozilla.@MOZ_APP_NAME@.crashReporter" >
<intent-filter> <intent-filter>
<action android:name="org.mozilla.gecko.reportCrash" /> <action android:name="org.mozilla.gecko.reportCrash" />
</intent-filter> </intent-filter>

1
embedding/android/CrashReporter.java.in
View File

@@ -297,7 +297,6 @@ public class CrashReporter extends Activity
Intent intent = new Intent(action); Intent intent = new Intent(action);
intent.setClassName("org.mozilla.@MOZ_APP_NAME@", intent.setClassName("org.mozilla.@MOZ_APP_NAME@",
"org.mozilla.@MOZ_APP_NAME@.App"); "org.mozilla.@MOZ_APP_NAME@.App");
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Log.i("GeckoCrashReporter", intent.toString()); Log.i("GeckoCrashReporter", intent.toString());
startActivity(intent); startActivity(intent);
} catch (Exception e) { } catch (Exception e) {

3
embedding/android/GeckoApp.java
View File

@@ -537,7 +537,8 @@ abstract public class GeckoApp
intent.setClassName("org.mozilla." + getAppName(), intent.setClassName("org.mozilla." + getAppName(),
"org.mozilla." + getAppName() + ".Restarter"); "org.mozilla." + getAppName() + ".Restarter");
addEnvToIntent(intent); 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()); Log.i("GeckoAppJava", intent.toString());
startActivity(intent); startActivity(intent);
} catch (Exception e) { } catch (Exception e) {