From ab17510332fd29fca1de28897f8c3488ecd85a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= Date: Mon, 9 Mar 2020 10:12:07 +0100 Subject: [PATCH] [expo-permissions][android] Fix brightness permission (#7276) * [expo-permissions][android] Fix brightness permission * [expo-permissions] Update changelog.md --- CHANGELOG.md | 2 ++ .../java/expo/modules/permissions/PermissionsService.kt | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c78e3a15293c4..39cd6a3dcf383 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ This is the log of notable changes to the Expo client that are developer-facing. ### 🐛 Bug fixes +- Fixed `Brightness.requestPermissionsAsync` throwing `permission cannot be null or empty` error on Android. ([#7276](https://github.com/expo/expo/pull/7276) by [@lukmccall](https://github.com/lukmccall)) + ## 37.0.0 ### 📚 3rd party library updates diff --git a/packages/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsService.kt b/packages/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsService.kt index 5559166b9ec46..18bcae71e7036 100644 --- a/packages/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsService.kt +++ b/packages/expo-permissions/android/src/main/java/expo/modules/permissions/PermissionsService.kt @@ -287,8 +287,13 @@ open class PermissionsService(val context: Context) : InternalModule, Permission mAskAsyncListener = null mAskAsyncRequestedPermissions = null - // invoke actual asking for permissions - askForManifestPermissions(askAsyncRequestedPermissions, askAsyncListener) + if (askAsyncRequestedPermissions.isNotEmpty()) { + // invoke actual asking for permissions + askForManifestPermissions(askAsyncRequestedPermissions, askAsyncListener) + } else { + // user asked only for Manifest.permission.WRITE_SETTINGS + askAsyncListener.onResult(mutableMapOf()) + } } override fun onHostPause() = Unit