Merge "Properly invalidate the show/hide system apps menu." (37ae3008) · Commits · e / os / android_packages_apps_PackageInstaller

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));