diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 21:20:56 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 21:21:10 +0000 |
| commit | 3571ed967c0e90b8bd72641afb30ccdaf016dd01 (patch) | |
| tree | 1107dfd3da0b05e0823d2cce9b232a6bd710ffd3 | |
| parent | e5acd08c75fc0a18d49c364dd582097294da901b (diff) | |
| parent | 46f1d0498816f8c0a310cfcc5f725208610bf1c1 (diff) | |
| download | Permission-3571ed967c0e90b8bd72641afb30ccdaf016dd01.tar.gz | |
Make change and version bump to aml_per_341410010 for mainline module file: PermissionController/AndroidManifest.xml
Make change and version bump to aml_per_341410010 for mainline module file: apex_manifest.json
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25544374'] into sparse-11159762-L89400030000685157.
SPARSE_CHANGE: I6c0634ee995d88caeb3ee0a3f66c69b8542c462c
Change-Id: I2946389161deea1a8fd47318b95f6b282ebb07f7
| -rw-r--r-- | PermissionController/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt | 20 | ||||
| -rw-r--r-- | apex_manifest.json | 2 |
3 files changed, 20 insertions, 6 deletions
diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml index 7a9b2546d..4698a39b2 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="341410000" - android:versionName="aml_per_341410000" + android:versionCode="341410010" + android:versionName="aml_per_341410010" > <original-package android:name="com.android.permissioncontroller" /> diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt index cc29acbd7..d2142a855 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt @@ -255,7 +255,6 @@ class AppPermissionViewModel( mutableMapOf<String, LightAppPermGroupLiveData>() init { - addSource(appPermGroupLiveData) { appPermGroup -> lightAppPermGroup = appPermGroup if (permGroupName in PermissionMapping.STORAGE_SUPERGROUP_PERMISSIONS) { @@ -398,6 +397,17 @@ class AppPermissionViewModel( deniedState.isChecked = !group.isGranted selectState.isChecked = isPartialStorageGrant(group) allowedState.isChecked = group.isGranted && !isPartialStorageGrant(group) + if (group.foreground.isPolicyFixed || group.foreground.isSystemFixed) { + allowedState.isEnabled = false + selectState.isEnabled = false + deniedState.isEnabled = false + showAdminSupportLiveData.value = admin + val detailId = + getDetailResIdForFixedByPolicyPermissionGroup(group, admin != null) + if (detailId != 0) { + detailResIdLiveData.value = detailId to null + } + } } else { // Allow / Deny case allowedState.isShown = true @@ -656,8 +666,12 @@ class AppPermissionViewModel( fun openPhotoPicker(fragment: Fragment) { val appPermGroup = lightAppPermGroup ?: return - openPhotoPickerForApp(fragment.requireActivity(), appPermGroup.packageInfo.uid, - appPermGroup.foregroundPermNames, 0) + openPhotoPickerForApp( + fragment.requireActivity(), + appPermGroup.packageInfo.uid, + appPermGroup.foregroundPermNames, + 0 + ) } /** diff --git a/apex_manifest.json b/apex_manifest.json index 46ca83c98..4d1d5a6bf 100644 --- a/apex_manifest.json +++ b/apex_manifest.json @@ -3,5 +3,5 @@ // Placeholder module version to be replaced during build. // Do not change! - "version": 341410000 + "version": 341410010 } |