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

Commit daa54f9a authored by Joel Galenson's avatar Joel Galenson
Browse files

Ensure we show counts on the permission filter dialog. 

When filtering permission usages by a specific permission, the
permission filter dialog only contained counts for that permission,
not the others.  This ensures we filter them out only after populating
the data structure to compute those counts.

In addition, when using the default sort, ensure we sort correctly in
the filtered case.

Test: Open filter dialog from filtered and unfiltered screens.
Test: Check sorts in filtered and unfiltered screens.
Change-Id: I7f52ebf7e8af781d19c63c9523f18556e7487586
parent bc678fde

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

+15 −7
Original line number Diff line number Diff line
@@ -400,9 +400,6 @@ 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) {
@@ -415,10 +412,17 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
                    continue;

                }



                usages.add(Pair.create(appUsage, appGroups.get(groupNum)));

                used = true;



                addGroupUser(groupUsage.getGroup().getName());



                // Filter out usages that aren't of the filtered permission group.

                // We do this after we call addGroupUser so we compute the correct usage counts

                // for the permission filter dialog but before we add the usage to our list.

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

                    continue;

                }



                usages.add(Pair.create(appUsage, appGroups.get(groupNum)));

            }

            if (used) {

                permApps.add(appUsage.getApp());
@@ -453,13 +457,17 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
        if (mSort == SORT_RECENT) {

            usages.sort(PermissionUsageFragment::compareAccessRecency);

        } else if (mSort == SORT_RECENT_APPS) {

            if (mFilterGroup == null) {

                usages.sort(PermissionUsageFragment::compareAccessAppRecency);

            } else {

                usages.sort(PermissionUsageFragment::compareAccessTime);

            }

        } else {

            Log.w(LOG_TAG, "Unexpected sort option: " + mSort);

        }



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

        if (permApps.isEmpty()) {

        if (usages.isEmpty()) {

            screen.removeAll();

        }