Merge "Fix time filters and intervals." (ab313f29) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -583,8 +583,7 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS

	long curTime = System.currentTimeMillis();		long curTime = System.currentTimeMillis();
	PermissionUsages usages = new PermissionUsages(this);		PermissionUsages usages = new PermissionUsages(this);
	long filterTimeBeginMillis = Math.max(System.currentTimeMillis() - numMillis,		long filterTimeBeginMillis = Math.max(System.currentTimeMillis() - numMillis, 0);
	System.currentTimeMillis());
	usages.load(null, null, filterTimeBeginMillis, Long.MAX_VALUE,		usages.load(null, null, filterTimeBeginMillis, Long.MAX_VALUE,
	PermissionUsages.USAGE_FLAG_LAST \| PermissionUsages.USAGE_FLAG_HISTORICAL, null,		PermissionUsages.USAGE_FLAG_LAST \| PermissionUsages.USAGE_FLAG_HISTORICAL, null,
	false, null, true);		false, null, true);

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

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -359,6 +359,10 @@ public class PermissionUsageFragment extends PermissionsFrameFragment implements

	mHasSystemApps = false;		mHasSystemApps = false;

			final TimeFilterItem timeFilterItem = getSelectedFilterItem();
			long curTime = System.currentTimeMillis();
			long startTime = (timeFilterItem == null ? 0 : (curTime - timeFilterItem.getTime()));

	List<Pair<AppPermissionUsage, GroupUsage>> usages = new ArrayList<>();		List<Pair<AppPermissionUsage, GroupUsage>> usages = new ArrayList<>();
	int numApps = appPermissionUsages.size();		int numApps = appPermissionUsages.size();
	for (int appNum = 0; appNum < numApps; appNum++) {		for (int appNum = 0; appNum < numApps; appNum++) {
	@@ -368,7 +372,8 @@ public class PermissionUsageFragment extends PermissionsFrameFragment implements
	for (int groupNum = 0; groupNum < numGroups; groupNum++) {		for (int groupNum = 0; groupNum < numGroups; groupNum++) {
	GroupUsage groupUsage = appGroups.get(groupNum);		GroupUsage groupUsage = appGroups.get(groupNum);

	if (groupUsage.getAccessCount() <= 0) {		if (groupUsage.getAccessCount() <= 0
			\|\| groupUsage.getLastAccessTime() < startTime) {
	continue;		continue;
	}		}
	final boolean isSystemApp = Utils.isSystem(appUsage.getApp(), mLauncherPkgs);		final boolean isSystemApp = Utils.isSystem(appUsage.getApp(), mLauncherPkgs);
	@@ -391,7 +396,6 @@ public class PermissionUsageFragment extends PermissionsFrameFragment implements
	}		}

	// Update bar chart.		// Update bar chart.
	final TimeFilterItem timeFilterItem = getSelectedFilterItem();
	final BarChartPreference barChart = createBarChart(usages, timeFilterItem, context);		final BarChartPreference barChart = createBarChart(usages, timeFilterItem, context);
	screen.addPreference(barChart);		screen.addPreference(barChart);

	@@ -478,7 +482,7 @@ public class PermissionUsageFragment extends PermissionsFrameFragment implements
	return;		return;
	}		}
	final long filterTimeBeginMillis = Math.max(System.currentTimeMillis()		final long filterTimeBeginMillis = Math.max(System.currentTimeMillis()
	- timeFilterItem.getTime(), Calendar.getInstance().getTimeInMillis());		- timeFilterItem.getTime(), 0);
	mPermissionUsages.load(null /filterPackageName/, null,		mPermissionUsages.load(null /filterPackageName/, null,
	filterTimeBeginMillis, Long.MAX_VALUE, PermissionUsages.USAGE_FLAG_LAST		filterTimeBeginMillis, Long.MAX_VALUE, PermissionUsages.USAGE_FLAG_LAST
	\| PermissionUsages.USAGE_FLAG_HISTORICAL, getActivity().getLoaderManager(),		\| PermissionUsages.USAGE_FLAG_HISTORICAL, getActivity().getLoaderManager(),