From 45478db795c29a0311a25ee18589f95396f4d8f0 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Fri, 29 Aug 2014 11:51:46 -0700
Subject: [PATCH] Bug 1058160 - Make o.m.g.BrowserApp LAUNCHER activity default
 and high priority. r=bnicholson

In order to launch in response to the MAIN activity (via |adb shell am
start -a android.intent.action.MAIN org.mozilla.fennec|, for example),
the activity must have category default.  That is added automatically to
<activity> elements that have category LAUNCHER, but apparently not to
<activity-alias> elements.  This patch adds it manually.

In general, <intent-filters> are prioritized by their order in the
manifest file.  To avoid future confusion, this patch bumps the
android:priority of the existing filter.

--HG--
extra : rebase_source : 021da06af2f3e41fc0f38eee7fc33360797f64b0
---
 mobile/android/base/AndroidManifest.xml.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 07e034934eb1..8a2a163d320c 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -129,10 +129,14 @@
         <activity-alias android:name=".App"
                         android:label="@MOZ_APP_DISPLAYNAME@"
                         android:targetActivity="org.mozilla.gecko.BrowserApp">
-            <intent-filter>
+            <!-- android:priority ranges between -1000 and 1000.  We never want
+                 another activity to usurp the MAIN action, so we ratchet our
+                 priority up. -->
+            <intent-filter android:priority="999">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
             <meta-data android:name="com.sec.minimode.icon.portrait.normal"