Bug 1322765 - [1.0] Move service declarations into application scope. r=rbarker
authorEugen Sawin <esawin@me73.com>
Fri, 09 Dec 2016 13:36:25 -1000
changeset 325621 b1d7f3640ea7b8c7004d50d0001845564c6f71df
parent 325620 5a110ad242ead60e71d2186bae78b1fb766ad5ff
child 325622 b877875abb3afc917bef6a2a14d39449eaf53ccd
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersrbarker
bugs1322765
milestone53.0a1
Bug 1322765 - [1.0] Move service declarations into application scope. r=rbarker
mobile/android/geckoview/src/main/AndroidManifest.xml
--- a/mobile/android/geckoview/src/main/AndroidManifest.xml
+++ b/mobile/android/geckoview/src/main/AndroidManifest.xml
@@ -31,26 +31,28 @@
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
 
     <!-- App requires OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
 
-    <!-- New child services must also be added to the Fennec AndroidManifest.xml.in -->
-    <service
-        android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$geckomediaplugin"
-        android:enabled="true"
-        android:exported="false"
-        android:process=":geckomediaplugin"
-        android:isolatedProcess="false">
-    </service>
+    <application>
+        <!-- New child services must also be added to the Fennec AndroidManifest.xml.in -->
+        <service
+            android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$geckomediaplugin"
+            android:enabled="true"
+            android:exported="false"
+            android:process=":geckomediaplugin"
+            android:isolatedProcess="false">
+        </service>
 
-    <service
-        android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$tab"
-        android:enabled="true"
-        android:exported="false"
-        android:process=":tab"
-        android:isolatedProcess="false">
-    </service>
+        <service
+            android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$tab"
+            android:enabled="true"
+            android:exported="false"
+            android:process=":tab"
+            android:isolatedProcess="false">
+        </service>
+   </application>
 
 </manifest>