Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-03 07:38:25 +00:00
committed by Android (Google) Code Review
parent 75f35b0494 74b048aac8
commit d26ded47a5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -3319,8 +3319,8 @@ public class StatsPullAtomService extends SystemService {
public void run() { public void run() {
try { try {
estimateAppOpsSamplingRate(); estimateAppOpsSamplingRate();
} catch (Exception e) { } catch (Throwable e) {
Slog.e(TAG, "AppOps sampling ratio estimation failed"); Slog.e(TAG, "AppOps sampling ratio estimation failed: ", e);
synchronized (mAppOpsSamplingRateLock) { synchronized (mAppOpsSamplingRateLock) {
mAppOpsSamplingRate = min(mAppOpsSamplingRate, 10); mAppOpsSamplingRate = min(mAppOpsSamplingRate, 10);
} }
@@ -3361,7 +3361,7 @@ public class StatsPullAtomService extends SystemService {
Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(), Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(),
Long.MAX_VALUE).setFlags( Long.MAX_VALUE).setFlags(
OP_FLAGS_PULLED).build(); 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, HistoricalOps histOps = ops.get(EXTERNAL_STATS_SYNC_TIMEOUT_MILLIS,
TimeUnit.MILLISECONDS); TimeUnit.MILLISECONDS);
List<AppOpEntry> opsList = List<AppOpEntry> opsList =