diff options
| author | Nate Myren <ntmyren@google.com> | 2023-03-22 14:28:58 -0700 |
|---|---|---|
| committer | Nate Myren <ntmyren@google.com> | 2023-03-24 18:22:58 +0000 |
| commit | c52287cddc0e37fb85561cf7b6e8e272d5390963 (patch) | |
| tree | 8034e379e38b18fb6c2b0a49051095f0085db645 /PermissionController/src/com/android/permissioncontroller/permission/utils | |
| parent | 104c323df8a91fbfe6b8d3952b9e868a9fe44f52 (diff) | |
| download | Permission-c52287cddc0e37fb85561cf7b6e8e272d5390963.tar.gz | |
Exclude auto, wear, and tv from photo picker behavior
They do not yet support photo picker
Bug: 271385365
Test: manual
Change-Id: Ibaaa2e8c165e25d38b925b02a860d63fb41ef931
Merged-In: Ibaaa2e8c165e25d38b925b02a860d63fb41ef931
Diffstat (limited to 'PermissionController/src/com/android/permissioncontroller/permission/utils')
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt index c6bcff422..397e564c1 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt @@ -72,6 +72,8 @@ import androidx.navigation.NavController import androidx.preference.Preference import androidx.preference.PreferenceGroup import com.android.modules.utils.build.SdkLevel +import com.android.permissioncontroller.DeviceUtils +import com.android.permissioncontroller.PermissionControllerApplication import com.android.permissioncontroller.R import com.android.permissioncontroller.permission.data.LightAppPermGroupLiveData import com.android.permissioncontroller.permission.data.LightPackageInfoLiveData @@ -265,8 +267,11 @@ object KotlinUtils { */ @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, codename = "UpsideDownCake") fun isPhotoPickerPromptEnabled(): Boolean { - return SdkLevel.isAtLeastU() && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, - PROPERTY_PHOTO_PICKER_PROMPT_ENABLED, true) + val app = PermissionControllerApplication.get() + return SdkLevel.isAtLeastU() && !DeviceUtils.isAuto(app) && + !DeviceUtils.isTelevision(app) && !DeviceUtils.isWear(app) && + DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_PRIVACY, PROPERTY_PHOTO_PICKER_PROMPT_ENABLED, true) } /* |