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

Commit 25aa2cd2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure filtered views are sorted correctly."

parents 96d135a1 35c4065a

src/com/android/packageinstaller/permission/ui/handheld/PermissionUsageFragment.java

+3 −3
Original line number Diff line number Diff line
@@ -400,6 +400,9 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
                        || groupUsage.getLastAccessTime() < startTime) {

                    continue;

                }

                if (mFilterGroup != null && !mFilterGroup.equals(groupUsage.getGroup().getName())) {

                    continue;

                }

                final boolean isSystemApp = !Utils.isGroupOrBgGroupUserSensitive(

                        groupUsage.getGroup());

                if (!mHasSystemApps) {
@@ -455,9 +458,6 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
            Log.w(LOG_TAG, "Unexpected sort option: " + mSort);

        }



        usages.removeIf((Pair<AppPermissionUsage, GroupUsage> usage) -> mFilterGroup != null

                && !mFilterGroup.equals(usage.second.getGroup().getName()));



        // If there are no entries, don't show anything.

        if (permApps.isEmpty()) {

            screen.removeAll();