diff options
| author | 2020-06-09 06:20:00 +0000 | |
|---|---|---|
| committer | 2020-06-09 06:20:00 +0000 | |
| commit | f2193638d7e1049559e933b73a57aec4aae77ac8 (patch) | |
| tree | 6baa85f99534bf1d59628fe3d683adb08cb148f5 | |
| parent | 2950ebf07d6a895cdb4832e7c07977feb7d13d6e (diff) | |
| parent | 4d0bf0f92c5cec4eb1e512017fc97b50b5587ad2 (diff) | |
Merge "Ensure beginTimeMillis is non-negative." into rvc-dev
| -rw-r--r-- | services/core/java/com/android/server/appop/AppOpsService.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/stats/pull/StatsPullAtomService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index c47b66b2ac51..435e82535baf 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -6035,7 +6035,7 @@ public class AppOpsService extends IAppOpsService.Stub { List<String> runtimeAppOpsList = getRuntimeAppOpsList(); AppOpsManager.HistoricalOpsRequest histOpsRequest = new AppOpsManager.HistoricalOpsRequest.Builder( - Instant.now().minus(7, ChronoUnit.DAYS).toEpochMilli(), + Math.max(Instant.now().minus(7, ChronoUnit.DAYS).toEpochMilli(), 0), Long.MAX_VALUE).setOpNames(runtimeAppOpsList).setFlags( OP_FLAG_SELF | OP_FLAG_TRUSTED_PROXIED).build(); appOps.getHistoricalOps(histOpsRequest, AsyncTask.THREAD_POOL_EXECUTOR, diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index cc4505c26aed..c2bae1a8962b 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -3519,7 +3519,7 @@ public class StatsPullAtomService extends SystemService { CompletableFuture<HistoricalOps> ops = new CompletableFuture<>(); HistoricalOpsRequest histOpsRequest = new HistoricalOpsRequest.Builder( - Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(), + Math.max(Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(), 0), Long.MAX_VALUE).setFlags( OP_FLAGS_PULLED).build(); appOps.getHistoricalOps(histOpsRequest, AsyncTask.THREAD_POOL_EXECUTOR, ops::complete); |