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

Commit d26ded47 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix AppOps estimation call time out." into rvc-dev

parents 75f35b04 74b048aa

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

+3 −3
Original line number Diff line number Diff line
@@ -3319,8 +3319,8 @@ public class StatsPullAtomService extends SystemService { 
                        public void run() {

                            try {

                                estimateAppOpsSamplingRate();

                            } catch (Exception e) {

                                Slog.e(TAG, "AppOps sampling ratio estimation failed");

                            } catch (Throwable e) {

                                Slog.e(TAG, "AppOps sampling ratio estimation failed: ", e);

                                synchronized (mAppOpsSamplingRateLock) {

                                    mAppOpsSamplingRate = min(mAppOpsSamplingRate, 10);

                                }
@@ -3361,7 +3361,7 @@ public class StatsPullAtomService extends SystemService { 
                        Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(),

                        Long.MAX_VALUE).setFlags(

                        OP_FLAGS_PULLED).build();

        appOps.getHistoricalOps(histOpsRequest, mContext.getMainExecutor(), ops::complete);

        appOps.getHistoricalOps(histOpsRequest, AsyncTask.THREAD_POOL_EXECUTOR, ops::complete);

        HistoricalOps histOps = ops.get(EXTERNAL_STATS_SYNC_TIMEOUT_MILLIS,

                TimeUnit.MILLISECONDS);

        List<AppOpEntry> opsList =