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

Fix AppOps estimation call time out.

Browse Source 
AppOps estimation call times out with likely reason being that
when Pooled excutor runs this task when StatsPulAtomService is
not active, mContext.getMainExecutor() provides executor which
is not active.

Test: atest testAppOps
Bug: 143519689
Change-Id: Ie2d61b3304b8cc0beb7d4e0ad06ba58aeed1bb19
This commit is contained in:
Stanislav Zholnin
2020-05-31 13:17:16 +01:00
parent f1ed02a503
commit 74b048aac8
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

@@ -3322,8 +3322,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);
}
@@ -3364,7 +3364,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 =