summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yuting Fang <yutingfang@google.com> 2023-04-12 22:46:39 +0000
committer Yuting Fang <yutingfang@google.com> 2023-04-12 22:58:53 +0000
commit68921f345cdf7dc18f38748884688fccfa52a56b (patch)
tree34fe4c59ee934555a7c1088888b92439bbc2faa5
parent1ce83af7689755795a613c63cb2c9cb7a17d1ffc (diff)
[Permission Hub Refactor] Fix stale "Today" "Yesterday" on the permission usage details page
MIDNIGHT_TODAY and MIDNIGHT_YESTERDAY was cached as static value in the code. So it didn't update its value when time passes which caused incorrect showing of "Today" and "Yesterday" on the timeline page. Moving it to local variable will make the value update everytime the code runs. Bug: 277111889 Test: Manual, atest CtsPermission3TestCases:PermissionHistoryTest Change-Id: I8bc8029ddf0b0cc8dd906527f88e6285a03fc554
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java25
1 files changed, 14 insertions, 11 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java
index 6a16c37b8..15ee31a54 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java
@@ -76,15 +76,6 @@ public class PermissionUsageDetailsFragment extends SettingsWithLargeHeader {
private static final int MENU_SHOW_7_DAYS_DATA = Menu.FIRST + 4;
private static final int MENU_SHOW_24_HOURS_DATA = Menu.FIRST + 5;
- private static final long MIDNIGHT_TODAY =
- ZonedDateTime.now(ZoneId.systemDefault()).truncatedTo(ChronoUnit.DAYS).toEpochSecond()
- * 1000L;
- private static final long MIDNIGHT_YESTERDAY =
- ZonedDateTime.now(ZoneId.systemDefault())
- .minusDays(1)
- .truncatedTo(ChronoUnit.DAYS)
- .toEpochSecond()
- * 1000L;
private @Nullable String mPermissionGroup;
private int mUsageSubtitle;
private boolean mHasSystemApps;
@@ -334,6 +325,18 @@ public class PermissionUsageDetailsFragment extends SettingsWithLargeHeader {
PreferenceScreen preferenceScreen) {
Context context = getContext();
long previousDateMs = 0L;
+ long midnightToday =
+ ZonedDateTime.now(ZoneId.systemDefault())
+ .truncatedTo(ChronoUnit.DAYS)
+ .toEpochSecond()
+ * 1000L;
+ long midnightYesterday =
+ ZonedDateTime.now(ZoneId.systemDefault())
+ .minusDays(1)
+ .truncatedTo(ChronoUnit.DAYS)
+ .toEpochSecond()
+ * 1000L;
+
for (int i = 0; i < appPermissionAccessUiInfoList.size(); i++) {
AppPermissionAccessUiInfo appPermissionAccessUiInfo =
appPermissionAccessUiInfoList.get(i);
@@ -350,9 +353,9 @@ public class PermissionUsageDetailsFragment extends SettingsWithLargeHeader {
category.set(createDayCategoryPreference());
preferenceScreen.addPreference(category.get());
}
- if (accessEndTime > MIDNIGHT_TODAY) {
+ if (accessEndTime > midnightToday) {
category.get().setTitle(R.string.permission_history_category_today);
- } else if (accessEndTime > MIDNIGHT_YESTERDAY) {
+ } else if (accessEndTime > midnightYesterday) {
category.get().setTitle(R.string.permission_history_category_yesterday);
} else {
category.get()