commit b969df8bba42205a9562489860431be200786cb0 Author: n8fr8 <nathan@freitas.net> Date: Thu Aug 3 15:12:48 2017 -0400 remove permissions we are not using in Orfox (GET_ACCOUNTS,Contacts) --- mobile/android/base/FennecManifest_permissions.xml.in | 5 +++++ .../services/manifests/FxAccountAndroidManifest_permissions.xml.in | 2 ++ 2 files changed, 7 insertions(+) diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index e711ce6a19de..b5a7b6a3132d 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -4,7 +4,10 @@ on top of a pre-installed bouncer APK. Add such elements here, so that they can be easily shared between the two APKs. --> +#ifdef TOR_IS_NOT_ORFOX #include ../services/manifests/FxAccountAndroidManifest_permissions.xml.in +#endif + #ifdef MOZ_ANDROID_SEARCH_ACTIVITY #include ../search/manifests/SearchAndroidManifest_permissions.xml.in @@ -15,7 +18,9 @@ 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. --> +#ifdef TOR_IS_NOT_ORFOX #include GcmAndroidManifest_permissions.xml.in +#endif #ifdef MOZ_WIFI_STATE <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/> diff --git a/mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in b/mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in index d5c7e3e5c7dc..7f59f094ec77 100644 --- a/mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in +++ b/mobile/android/services/manifests/FxAccountAndroidManifest_permissions.xml.in @@ -1,3 +1,4 @@ +#ifdef MOZILLA_OFFICIAL <uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> @@ -16,3 +17,4 @@ </permission> <uses-permission android:name="@ANDROID_PACKAGE_NAME@_fxaccount.permission.PER_ACCOUNT_TYPE" /> +#endif