commit 481f6b374dbf9a22348c24429fcd05eb12082449 Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Mon Apr 16 04:22:51 2018 +0000

Bug 25741 - TBA: Only include Firefox Account permissions if we want them --- mobile/android/base/AndroidManifest.xml.in | 4 ++++ mobile/android/base/FennecManifest_permissions.xml.in | 4 ++++ 2 files changed, 8 insertions(+)

diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index 548c662939f6..4f626dcc2098 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -269,7 +269,9 @@ </intent-filter> </receiver>

+#ifdef MOZ_ACCOUNT #include ../services/manifests/FxAccountAndroidManifest_activities.xml.in +#endif

#ifdef MOZ_CRASHREPORTER <activity android:name="org.mozilla.gecko.CrashReporter" @@ -415,7 +417,9 @@ </intent-filter> </service>

+#ifdef MOZ_ACCOUNT #include ../services/manifests/FxAccountAndroidManifest_services.xml.in +#endif

<service android:name="org.mozilla.gecko.tabqueue.TabReceivedService" diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index 7ca8239cca5a..eb4e111f6800 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -1,5 +1,7 @@

+#ifdef MOZ_ACCOUNT #include ../services/manifests/FxAccountAndroidManifest_permissions.xml.in +#endif

<!-- Bug 1261302: we have two new permissions to request, RECEIVE_BOOT_COMPLETED and the permission for push. We want to ask for @@ -25,7 +27,9 @@ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/> <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/> +#ifdef MOZ_ANDROID_LOCATION <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/> +#endif

<uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.VIBRATE"/>