commit 00bd8b9f1828b0bba9070a8cae62c786987b5531
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 12 20:58:36 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 12 20:58:36 2021 +0000
tree 274d9d9c6773a4211a964def2b03318e2a9a3d08
parent 4766ce0a3bf473bc70241513165eda049b2fd6c1
parent 6560738579a2b4873e1fa9bae4c4a5d2713ec8a6

Merge "Directly use packageInfoLiveData value in PermStateLiveData" into mainline-prod

PermissionController/src/com/android/permissioncontroller/permission/data/PermStateLiveData.kt

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/data/PermStateLiveData.kt b/PermissionController/src/com/android/permissioncontroller/permission/data/PermStateLiveData.kt
index 7336099..0491fdf 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/data/PermStateLiveData.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/data/PermStateLiveData.kt
@@ -51,12 +51,10 @@
 
     private var uid: Int? = null
     private var registeredUid: Int? = null
-    private var currentPackageInfo: LightPackageInfo? = null
 
     init {
         addSource(packageInfoLiveData) {
             checkForUidUpdate(it)
-            currentPackageInfo = it
             updateAsync()
         }
 
@@ -74,7 +72,7 @@
             return
         }
 
-        val packageInfo = currentPackageInfo
+        val packageInfo = packageInfoLiveData.value
         val permissionGroup = groupLiveData.value
         if (packageInfo == null || permissionGroup == null) {
             invalidateSingle(Triple(packageName, permGroupName, user))