Bug 1261302 - Decouple the push permission from MOZ_ANDROID_GCM. r?sebastian draft
authorNick Alexander <nalexander@mozilla.com>
Mon, 04 Apr 2016 10:38:04 -0700
changeset 347339 f956565de49a8e1f153025a7d33161a6cba7c6e9
parent 347338 b3501e6ad98af3c4e6833bcc2725f374f171805b
child 517607 19f14085cb42fbc7ed4b2076c07fee6c081d92ee
push id14557
push usernalexander@mozilla.com
push dateMon, 04 Apr 2016 17:39:33 +0000
reviewerssebastian
bugs1261302
milestone48.0a1
Bug 1261302 - Decouple the push permission from MOZ_ANDROID_GCM. r?sebastian MozReview-Commit-ID: 2enIZSm4FuF
mobile/android/base/FennecManifest_permissions.xml.in
--- a/mobile/android/base/FennecManifest_permissions.xml.in
+++ b/mobile/android/base/FennecManifest_permissions.xml.in
@@ -5,19 +5,22 @@
      they can be easily shared between the two APKs. -->
 
 #include ../services/manifests/FxAccountAndroidManifest_permissions.xml.in
 
 #ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 #include ../search/manifests/SearchAndroidManifest_permissions.xml.in
 #endif
 
-#ifdef MOZ_ANDROID_GCM
+<!-- Bug 1261302: we have two new permissions to request,
+     RECEIVE_BOOT_COMPLETED and the permission for push.  We want to ask for
+     them during the same release, which should be Fennec 48.  Therefore we
+     decouple the push permission from MOZ_ANDROID_GCM to let it ride ahead
+     (potentially) of the push feature. -->
 #include GcmAndroidManifest_permissions.xml.in
-#endif
 
     <!-- A signature level permission specific to each Firefox version (Android
          package name, e.g., org.mozilla.firefox).  Use this permission to
          broadcast securely within a single Firefox version.  This needs to
          agree with GlobalConstants.PER_ANDROID_PACKAGE_PERMISSION. -->
     <permission
         android:name="@ANDROID_PACKAGE_NAME@.permission.PER_ANDROID_PACKAGE"
         android:protectionLevel="signature"/>