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

Commit a088e7b5 authored by Manjeet Rulhania's avatar Manjeet Rulhania
Browse files

Fix missing cutoff in begin time calculations in sqlite 

Change-Id: Ia05a9a9486ff6699c6310283a37a7914a3a5297a
Fix: 388352483
Test: atest android.app.appops.cts.DiscreteAppopsTest#testCutoffTime --iterations 10
FLAG: EXEMPT bug fix
parent e2bfbd6c

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

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ import java.io.File; 
import java.io.PrintWriter;

import java.text.SimpleDateFormat;

import java.time.Duration;

import java.time.Instant;

import java.time.temporal.ChronoUnit;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;
@@ -176,6 +178,8 @@ public class DiscreteOpsSqlRegistry extends DiscreteOpsRegistry { 
        writeAndClearOldAccessHistory();

        boolean assembleChains = attributionExemptPkgs != null;

        IntArray opCodes = getAppOpCodes(filter, opNamesFilter);

        beginTimeMillis = Math.max(beginTimeMillis, Instant.now().minus(sDiscreteHistoryCutoff,

                ChronoUnit.MILLIS).toEpochMilli());

        List<DiscreteOp> discreteOps = mDiscreteOpsDbHelper.getDiscreteOps(filter, uidFilter,

                packageNameFilter, attributionTagFilter, opCodes, opFlagsFilter, beginTimeMillis,

                endTimeMillis, -1, null);