Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/267131
Change subject: Put RECEIVE_BOOT_COMPLETED permission into custom channel builds only. ...................................................................... Put RECEIVE_BOOT_COMPLETED permission into custom channel builds only. This puts the RECEIVE_BOOT_COMPLETED permission into the "custom" and "dev" flavors of the build, and leaves it out of the main build. The receiver and intent-filter remain in place, but it simply won't be called if the permission isn't present. Bug: T125110 Change-Id: I294fa223280a6a4a7cb2f24bd1204ddc16dbc06d --- M app/src/custom/AndroidManifest.xml A app/src/dev/AndroidManifest.xml M app/src/main/AndroidManifest.xml 3 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/31/267131/1 diff --git a/app/src/custom/AndroidManifest.xml b/app/src/custom/AndroidManifest.xml index 42381f8..a735979 100644 --- a/app/src/custom/AndroidManifest.xml +++ b/app/src/custom/AndroidManifest.xml @@ -1,6 +1,9 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:tools="http://schemas.android.com/tools";> + <!-- For recording OEM preload channel ID prior to app upgrades. --> + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <application> <meta-data android:name="@string/preference_key_app_channel" diff --git a/app/src/dev/AndroidManifest.xml b/app/src/dev/AndroidManifest.xml new file mode 100644 index 0000000..a7ef4df --- /dev/null +++ b/app/src/dev/AndroidManifest.xml @@ -0,0 +1,7 @@ +<manifest xmlns:android="http://schemas.android.com/apk/res/android"; + xmlns:tools="http://schemas.android.com/tools";> + + <!-- For recording OEM preload channel ID prior to app upgrades. --> + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + +</manifest> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a50e86e..1b39702 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,9 +15,6 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <!-- For recording OEM preload channel ID prior to app upgrades. --> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> - <!-- For Nearby feature --> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-feature android:name="android.hardware.location" android:required="false" /> -- To view, visit https://gerrit.wikimedia.org/r/267131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I294fa223280a6a4a7cb2f24bd1204ddc16dbc06d Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
