Update installsource logic for safety labels

Add InstallSourceInfo#getPackageSource() to the store vs preinstall app check used to determine the source of an apk and it's safety label

Bug: 277271100
Test: atest AppDataSharingUpdatesTest
Test: atest AppPermissionTest
Test: atest PermissionRationalePermissionGrantDialogTest
Test: atest PermissionRationaleTest
Test: atest SafetyLabelChangesJobServiceTest
Change-Id: I3e0601e6ab143b06ad12ac630cf183d01a20064e

1 files changed, 16 insertions, 9 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt
index 56d6b8efa..17c59a19a 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt
@@ -55,7 +55,7 @@ import com.android.permissioncontroller.PermissionControllerStatsLog.APP_DATA_SH
 import com.android.permissioncontroller.PermissionControllerStatsLog.APP_DATA_SHARING_UPDATES_NOTIFICATION_INTERACTION__ACTION__DISMISSED
 import com.android.permissioncontroller.PermissionControllerStatsLog.APP_DATA_SHARING_UPDATES_NOTIFICATION_INTERACTION__ACTION__NOTIFICATION_SHOWN
 import com.android.permissioncontroller.R
-import com.android.permissioncontroller.permission.data.LightInstallSourceInfoLiveData
+import com.android.permissioncontroller.permission.data.v34.LightInstallSourceInfoLiveData
 import com.android.permissioncontroller.permission.data.LightPackageInfoLiveData
 import com.android.permissioncontroller.permission.data.SinglePermGroupPackagesUiInfoLiveData
 import com.android.permissioncontroller.permission.data.v34.AppDataSharingUpdatesLiveData
@@ -249,11 +249,11 @@ class SafetyLabelChangesJobService : JobService() {
         val historyFile = AppsSafetyLabelHistoryPersistence.getSafetyLabelHistoryFile(context)
         val safetyLabelsLastUpdatedTimes: Map<AppInfo, Instant> =
             AppsSafetyLabelHistoryPersistence.getSafetyLabelsLastUpdatedTimes(historyFile)
-        // Retrieve all installed packages that are not pre-installed on the system and
+        // Retrieve all installed packages that are store installed on the system and
         // that request the location permission; these are the packages that we care about for the
         // safety labels feature. The variable name does not specify all these filters for brevity.
         val packagesRequestingLocation: Set<Pair<String, UserHandle>> =
-            getAllNonPreinstalledPackagesRequestingLocation()
+            getAllStoreInstalledPackagesRequestingLocation()
 
         val safetyLabelsToRecord = mutableSetOf<SafetyLabelForPersistence>()
         val packageNamesWithPersistedSafetyLabels =
@@ -385,11 +385,11 @@ class SafetyLabelChangesJobService : JobService() {
         val historyFile = AppsSafetyLabelHistoryPersistence.getSafetyLabelHistoryFile(context)
         val safetyLabelsLastUpdatedTimes: Map<AppInfo, Instant> =
             AppsSafetyLabelHistoryPersistence.getSafetyLabelsLastUpdatedTimes(historyFile)
-        // Retrieve all installed packages that are not pre-installed on the system and
+        // Retrieve all installed packages that are store installed on the system and
         // that request the location permission; these are the packages that we care about for the
         // safety labels feature. The variable name does not specify all these filters for brevity.
         val packagesRequestingLocation: Set<Pair<String, UserHandle>> =
-            getAllNonPreinstalledPackagesRequestingLocation()
+            getAllStoreInstalledPackagesRequestingLocation()
 
         val packageNamesWithPersistedSafetyLabels: List<String> =
             safetyLabelsLastUpdatedTimes.keys.map { appInfo -> appInfo.packageName }
@@ -417,9 +417,11 @@ class SafetyLabelChangesJobService : JobService() {
 
     // TODO(b/261607291): Modify this logic when we enable safety label change notifications for
     //  preinstalled apps.
-    private suspend fun getAllNonPreinstalledPackagesRequestingLocation():
+    private suspend fun getAllStoreInstalledPackagesRequestingLocation():
         Set<Pair<String, UserHandle>> =
-        getAllPackagesRequestingLocation().filter { !isPreinstalledPackage(it) }.toSet()
+        getAllPackagesRequestingLocation()
+            .filter { isStoreInstalledPackage(it) }
+            .toSet()
 
     private suspend fun getAllPackagesRequestingLocation(): Set<Pair<String, UserHandle>> =
         SinglePermGroupPackagesUiInfoLiveData[Manifest.permission_group.LOCATION]
@@ -435,8 +437,13 @@ class SafetyLabelChangesJobService : JobService() {
     private fun AppPermGroupUiInfo.isPermissionGranted() =
         permGrantState in setOf(PERMS_ALLOWED_ALWAYS, PERMS_ALLOWED_FOREGROUND_ONLY)
 
-    private suspend fun isPreinstalledPackage(pkg: Pair<String, UserHandle>): Boolean =
-        LightInstallSourceInfoLiveData[pkg].getInitializedValue().initiatingPackageName == null
+    private suspend fun isStoreInstalledPackage(
+        pkg: Pair<String, UserHandle>
+    ): Boolean {
+        val lightInstallSourceInfo =
+            LightInstallSourceInfoLiveData[pkg].getInitializedValue()
+        return lightInstallSourceInfo.isStoreInstalled()
+    }
 
     private suspend fun postSafetyLabelChangedNotification() {
         val numberOfAppUpdates = getNumberOfAppsWithDataSharingChanged()