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

Commit 61f1091b authored by Joel Galenson's avatar Joel Galenson
Browse files

Properly invalidate the show/hide system apps menu. 

The old code only invalidated the options menu when it sees system
apps for the first time.  Now that we can change the definition of
what is a system app, we should also invalidate the menu when there
are no system apps when there used to be some.

Fixes: 129477843
Test: Open dashboard, Advanced settings, toggle global/per-app switch,
go back, refresh, see correct menu items.

Change-Id: Ic20e040b57d51d94fdd3ec7e1e2f3ed50cee9668
parent fdb6633a

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

+7 −7
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
        }

        screen.removeAll();



        mHasSystemApps = false;

        boolean seenSystemApp = false;



        final TimeFilterItem timeFilterItem = mFilterTimes.get(mFilterTimeIndex);

        long curTime = System.currentTimeMillis();
@@ -410,12 +410,7 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
                }

                final boolean isSystemApp = !Utils.isGroupOrBgGroupUserSensitive(

                        groupUsage.getGroup());

                if (!mHasSystemApps) {

                    if (isSystemApp) {

                        mHasSystemApps = true;

                        getActivity().invalidateOptionsMenu();

                    }

                }

                seenSystemApp = seenSystemApp || isSystemApp;

                if (isSystemApp && !mShowSystem) {

                    continue;

                }
@@ -438,6 +433,11 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
            }

        }



        if (mHasSystemApps != seenSystemApp) {

            mHasSystemApps = seenSystemApp;

            getActivity().invalidateOptionsMenu();

        }



        // Update header.

        if (mFilterGroup == null) {

            screen.addPreference(createBarChart(usages, timeFilterItem, context));