Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 675403fb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure beginTimeMillis is non-negative." into rvc-dev am: f2193638 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11799714

Change-Id: Id8baebea959f31e4982e6e10dd266e08832dda4d
parents b18e625b f2193638

services/core/java/com/android/server/appop/AppOpsService.java

+1 −1
Original line number Diff line number Diff line
@@ -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,

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);