summaryrefslogtreecommitdiff
path: root/PermissionController/src/com
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-04-26 20:02:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-04-26 20:02:03 +0000
commit36fc639baecf21fcfa1cdedce269ecd7652d36a7 (patch)
treeb73d9f77d6af79392e185d709fd3300bf4963b3b /PermissionController/src/com
parentd9da2ae1547061832fddbecb047511a961c1d3d1 (diff)
parent59594b800551df2b050ededd4800d792eded6e3a (diff)
downloadPermission-36fc639baecf21fcfa1cdedce269ecd7652d36a7.tar.gz
Merge "Make observer explicitly ask for nullable any in setSourcesToDifference" into udc-dev
Diffstat (limited to 'PermissionController/src/com')
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/data/SmartUpdateMediatorLiveData.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/data/SmartUpdateMediatorLiveData.kt b/PermissionController/src/com/android/permissioncontroller/permission/data/SmartUpdateMediatorLiveData.kt
index c1a8f5abd..d7fe4fb2e 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/data/SmartUpdateMediatorLiveData.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/data/SmartUpdateMediatorLiveData.kt
@@ -201,7 +201,7 @@ abstract class SmartUpdateMediatorLiveData<T>(private val isStaticVal: Boolean =
val liveData = getLiveDataFun(key)
// Should be a no op, but there is a slight possibility it isn't
have[key] = liveData
- val observer = Observer<Any> {
+ val observer = Observer<Any?> {
if (onUpdateFun != null) {
onUpdateFun(key)
} else {