summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2024-01-24 00:40:47 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-01-24 00:40:47 +0000
commitb354559c5103d24c4669617e603d020581c9e1d9 (patch)
tree3d66a21463df43be33f82762c1a7badb6d81d6b1
parenta7245e71d19868b4a57c326f4afa01d563189770 (diff)
parent196cec2e848943f29c6b2c4623ec5a80d8eb891a (diff)
Merge "Mark GrantPermissions callback as nullable" into main
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt
index 3786b99bd..91b94da9a 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt
@@ -171,7 +171,7 @@ class GrantPermissionsViewModel(
private var appPermGroupLiveDatas = mutableMapOf<String, LightAppPermGroupLiveData>()
- internal data class ResultCallback(val consumer: Consumer<Intent>, val requestCode: Int)
+ internal data class ResultCallback(val consumer: Consumer<Intent?>, val requestCode: Int)
private var activityResultCallback: ResultCallback? = null