Remove unused time filter code from priv dash am: 979662dfa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/15067553
Change-Id: I3f789e00e986d45e20f709a5b9c41c0c3260384d
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionUsageV2Fragment.java b/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionUsageV2Fragment.java
index 6e1fcca..5077d7e 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionUsageV2Fragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionUsageV2Fragment.java
@@ -16,10 +16,7 @@
package com.android.permissioncontroller.permission.debug;
-import static java.lang.annotation.RetentionPolicy.SOURCE;
import static java.util.concurrent.TimeUnit.DAYS;
-import static java.util.concurrent.TimeUnit.HOURS;
-import static java.util.concurrent.TimeUnit.MINUTES;
import android.Manifest;
import android.app.ActionBar;
@@ -34,7 +31,6 @@
import android.view.MenuInflater;
import android.view.MenuItem;
-import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
@@ -56,7 +52,6 @@
import com.android.permissioncontroller.permission.utils.Utils;
import com.android.settingslib.HelpUtils;
-import java.lang.annotation.Retention;
import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
@@ -65,24 +60,16 @@
import java.util.Set;
/**
- * This is a V2 version of the permission usage page. WIP.
+ * The main page for the privacy dashboard.
*/
public class PermissionUsageV2Fragment extends SettingsWithLargeHeader implements
PermissionUsages.PermissionsUsagesChangeCallback {
private static final String LOG_TAG = "PermUsageV2Fragment";
- @Retention(SOURCE)
- @IntDef(value = {SORT_RECENT, SORT_RECENT_APPS})
- @interface SortOption {}
- static final int SORT_RECENT = 1;
- static final int SORT_RECENT_APPS = 2;
-
- public static final int FILTER_24_HOURS = 2;
private static final int MENU_REFRESH = MENU_HIDE_SYSTEM + 1;
- private static final String KEY_TIME_INDEX = "_time_index";
- private static final String TIME_INDEX_KEY = PermissionUsageV2Fragment.class.getName()
- + KEY_TIME_INDEX;
+ /** TODO(ewol): Use the config setting to determine amount of time to show. */
+ private static final long TIME_FILTER_MILLIS = DAYS.toMillis(1);
private static final Map<String, Integer> PERMISSION_GROUP_ORDER = Map.of(
Manifest.permission_group.LOCATION, 0,
@@ -100,9 +87,6 @@
private @NonNull PermissionUsages mPermissionUsages;
private @Nullable List<AppPermissionUsage> mAppPermissionUsages = new ArrayList<>();
- private @NonNull List<TimeFilterItem> mFilterTimes;
- private int mFilterTimeIndex;
-
private boolean mShowSystem;
private boolean mHasSystemApps;
private MenuItem mShowSystemMenu;
@@ -121,12 +105,6 @@
super.onCreate(savedInstanceState);
mFinishedInitialLoad = false;
- initializeTimeFilter();
- mFilterTimeIndex = FILTER_24_HOURS;
-
- if (savedInstanceState != null) {
- mFilterTimeIndex = savedInstanceState.getInt(TIME_INDEX_KEY);
- }
// By default, do not show system app usages.
mShowSystem = false;
@@ -213,33 +191,6 @@
getActivity().setTitle(R.string.permission_usage_title);
}
- /**
- * Initialize the time filter to show the smallest entry greater than the time passed in as an
- * argument. If nothing is passed, this simply initializes the possible values.
- */
- private void initializeTimeFilter() {
- Context context = getPreferenceManager().getContext();
- mFilterTimes = new ArrayList<>();
- mFilterTimes.add(new TimeFilterItem(Long.MAX_VALUE,
- context.getString(R.string.permission_usage_any_time)));
- mFilterTimes.add(new TimeFilterItem(DAYS.toMillis(7),
- context.getString(R.string.permission_usage_last_7_days)));
- mFilterTimes.add(new TimeFilterItem(DAYS.toMillis(1),
- context.getString(R.string.permission_usage_last_day)));
- mFilterTimes.add(new TimeFilterItem(HOURS.toMillis(1),
- context.getString(R.string.permission_usage_last_hour)));
- mFilterTimes.add(new TimeFilterItem(MINUTES.toMillis(15),
- context.getString(R.string.permission_usage_last_15_minutes)));
- mFilterTimes.add(new TimeFilterItem(MINUTES.toMillis(1),
- context.getString(R.string.permission_usage_last_minute)));
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- outState.putInt(TIME_INDEX_KEY, mFilterTimeIndex);
- }
-
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
@@ -314,9 +265,8 @@
screen.removeAll();
screen.setInitialExpandedChildrenCount(PERMISSION_USAGE_INITIAL_EXPANDED_CHILDREN_COUNT);
- final TimeFilterItem timeFilterItem = mFilterTimes.get(mFilterTimeIndex);
long curTime = System.currentTimeMillis();
- long startTime = Math.max(timeFilterItem == null ? 0 : (curTime - timeFilterItem.getTime()),
+ long startTime = Math.max(curTime - TIME_FILTER_MILLIS,
Instant.EPOCH.toEpochMilli());
mGroupAppCounts.clear();
@@ -504,9 +454,8 @@
* Reloads the data to show.
*/
private void reloadData() {
- final TimeFilterItem timeFilterItem = mFilterTimes.get(mFilterTimeIndex);
final long filterTimeBeginMillis = Math.max(System.currentTimeMillis()
- - timeFilterItem.getTime(), Instant.EPOCH.toEpochMilli());
+ - TIME_FILTER_MILLIS, Instant.EPOCH.toEpochMilli());
mPermissionUsages.load(null /*filterPackageName*/, null /*filterPermissionGroups*/,
filterTimeBeginMillis, Long.MAX_VALUE, PermissionUsages.USAGE_FLAG_LAST
| PermissionUsages.USAGE_FLAG_HISTORICAL, getActivity().getLoaderManager(),
@@ -556,30 +505,4 @@
}
return groups;
}
-
- /**
- * A class representing a given time, e.g., "in the last hour".
- */
- private static class TimeFilterItem {
- private final long mTime;
- private final @NonNull String mLabel;
-
- TimeFilterItem(long time, @NonNull String label) {
- mTime = time;
- mLabel = label;
- }
-
- /**
- * Get the time represented by this object in milliseconds.
- *
- * @return the time represented by this object.
- */
- public long getTime() {
- return mTime;
- }
-
- public @NonNull String getLabel() {
- return mLabel;
- }
- }
}
