Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00017a95 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure that "media only" button isn't always set" into rvc-dev am: 7aebdf0f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PackageInstaller/+/11760130

Change-Id: I12e7256dc8b0d660df4aaeeb57598b2938c527bf
parents 2e2066f3 7aebdf0f

src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt

+2 −3
Original line number Diff line number Diff line
@@ -343,8 +343,6 @@ class AppPermissionViewModel( 
                        allowedAllFilesState.isShown = true

                        if (storageState.isGranted) {

                            allowedAllFilesState.isChecked = true

                        } else if (allowedState.isChecked) {

                            allowedMediaOnlyState.isChecked = true

                        }

                } else {

                    allowedAllFilesState.isEnabled = false
@@ -352,7 +350,8 @@ class AppPermissionViewModel( 
                }

                allowedMediaOnlyState.isShown = true

                allowedMediaOnlyState.isEnabled = allowedState.isEnabled

                allowedMediaOnlyState.isChecked = allowedState.isChecked

                allowedMediaOnlyState.isChecked = allowedState.isChecked &&

                    storageState?.isGranted != true

                allowedState.isChecked = false

                allowedState.isShown = false

            }