diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-16 01:07:30 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-16 01:07:41 +0000 |
| commit | dbf97b62e9b2233f38381baa5fdd1ccf813c7364 (patch) | |
| tree | a6196ab2d9e57640bb9b32d1206e494af0be57b7 | |
| parent | b2dc03a26db6e877ee6a19a48252cd418415c469 (diff) | |
| parent | 48d3e4a44bb11b68dc82092ec4a9824aca880ac6 (diff) | |
| download | Permission-dbf97b62e9b2233f38381baa5fdd1ccf813c7364.tar.gz | |
Make change and version bump to aml_per_311611020 for mainline module file: PermissionController/AndroidManifest.xml
Change-Id: Ic358013987d66228d9c4ada2928d776c41bcd57b
| -rw-r--r-- | PermissionController/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/data/LauncherPackagesLiveData.kt | 19 | ||||
| -rw-r--r-- | apex_manifest.json | 2 |
3 files changed, 19 insertions, 6 deletions
diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml index 5a6c6425f..bcde7fbf5 100644 --- a/PermissionController/AndroidManifest.xml +++ b/PermissionController/AndroidManifest.xml @@ -4,8 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" package="com.android.permissioncontroller" coreApp="true" - android:versionCode="311611010" - android:versionName="aml_per_311611010" + android:versionCode="311611020" + android:versionName="aml_per_311611020" > <original-package android:name="com.android.permissioncontroller" /> diff --git a/PermissionController/src/com/android/permissioncontroller/permission/data/LauncherPackagesLiveData.kt b/PermissionController/src/com/android/permissioncontroller/permission/data/LauncherPackagesLiveData.kt index da0f26000..f0d811821 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/data/LauncherPackagesLiveData.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/data/LauncherPackagesLiveData.kt @@ -19,6 +19,7 @@ package com.android.permissioncontroller.permission.data import android.content.Intent import android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE import android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE +import android.content.pm.PackageManager.FEATURE_LEANBACK import com.android.permissioncontroller.PermissionControllerApplication import kotlinx.coroutines.Job @@ -31,14 +32,26 @@ object LauncherPackagesLiveData : SmartAsyncMediatorLiveData<Set<String>>(), private val LAUNCHER_INTENT = Intent(Intent.ACTION_MAIN, null) .addCategory(Intent.CATEGORY_LAUNCHER) + // On ATV some apps may have a leanback launcher icon but no regular launcher icon + private val LEANBACK_LAUNCHER_INTENT = Intent(Intent.ACTION_MAIN, null) + .addCategory(Intent.CATEGORY_LEANBACK_LAUNCHER) + override suspend fun loadDataAndPostValue(job: Job) { val launcherPkgs = mutableSetOf<String>() + + loadPkgsFromIntent(launcherPkgs, LAUNCHER_INTENT) + if (PermissionControllerApplication.get().packageManager + .hasSystemFeature(FEATURE_LEANBACK)) { + loadPkgsFromIntent(launcherPkgs, LEANBACK_LAUNCHER_INTENT) + } + postValue(launcherPkgs) + } + + private fun loadPkgsFromIntent(launcherPkgs: MutableSet<String>, intent: Intent) { for (info in PermissionControllerApplication.get().packageManager.queryIntentActivities( - LAUNCHER_INTENT, MATCH_DIRECT_BOOT_AWARE or MATCH_DIRECT_BOOT_UNAWARE)) { + intent, MATCH_DIRECT_BOOT_AWARE or MATCH_DIRECT_BOOT_UNAWARE)) { launcherPkgs.add(info.activityInfo.packageName) } - - postValue(launcherPkgs) } override fun onPackageUpdate(packageName: String) { diff --git a/apex_manifest.json b/apex_manifest.json index b8aaccbde..cbd5f23ba 100644 --- a/apex_manifest.json +++ b/apex_manifest.json @@ -1,4 +1,4 @@ { "name": "com.android.permission", - "version": 311611010 + "version": 311611020 } |