From 1b1e1346766c8d11410fbea16bb7c2685de06fbf Mon Sep 17 00:00:00 2001
From: Chris Kitching <chriskitching@linux.com>
Date: Sun, 24 Aug 2014 17:02:35 -0700
Subject: [PATCH] Bug 1044794 - Part 2: disable Sync share handler when share
 overlay is enabled. r=rnewman,nalexander

---
 .../services/manifests/SyncAndroidManifest_activities.xml.in    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in b/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in
index a0cd5fc14af9..17822df6fbfa 100644
--- a/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in
+++ b/mobile/android/services/manifests/SyncAndroidManifest_activities.xml.in
@@ -74,6 +74,7 @@
             </intent-filter>
         </receiver>
 
+#ifndef MOZ_ANDROID_SHARE_OVERLAY
         <activity
             android:theme="@style/SyncTheme"
             android:excludeFromRecents="true"
@@ -90,3 +91,4 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
+#endif