diff options
| author | Nate Myren <ntmyren@google.com> | 2024-01-30 18:10:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-30 18:10:21 +0000 |
| commit | 89d827be2cc6b7e59f85ba751f6600d26886617f (patch) | |
| tree | ecb48298e10ae141a06fedd90ee171a5131ac95a | |
| parent | 0e15460c63b6010ede1f75e55a93cff5187e6db1 (diff) | |
| parent | dfd3b760dd8dc4552f5a3ee5bbccaf60e94d3d44 (diff) | |
| download | Permission-89d827be2cc6b7e59f85ba751f6600d26886617f.tar.gz | |
Mark GrantPermissionsViewModel callback as nullable am: dfd3b760dd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2933630
Change-Id: I099e91af6d2baefd937ad1bf82a466c56f51ae78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt | 2 |
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 0680ffcd2..22bbc3b42 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt @@ -199,7 +199,7 @@ class GrantPermissionsViewModel( val groupName = groupInfo.name } - var activityResultCallback: Consumer<Intent>? = null + var activityResultCallback: Consumer<Intent?>? = null /** * A LiveData which holds a list of the currently pending RequestInfos |