From d20eacc040477fba45e35dd1779241b514df9980 Mon Sep 17 00:00:00 2001 From: Stanislav Zholnin Date: Mon, 2 Mar 2020 18:44:45 +0000 Subject: Fix AppOps collection bug. Confirmed by tests (will be submitted seraprately) In situation when shell blames app for certain app_op, shell gets PROXIED count increased while app gets PROXY count increased. Bug: 143519689 Test: make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive 10060 Change-Id: I9459c6fd42e8d9b11a8069d185472964b8816a8c --- .../core/java/com/android/server/stats/pull/StatsPullAtomService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index e426574fb9b7..24e0ab9f8d4a 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -17,7 +17,7 @@ package com.android.server.stats.pull; import static android.app.AppOpsManager.OP_FLAG_SELF; -import static android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXIED; +import static android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXY; import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED; import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS; import static android.os.Debug.getIonHeapsSizeKb; @@ -187,7 +187,7 @@ public class StatsPullAtomService extends SystemService { private static final int MAX_BATTERY_STATS_HELPER_FREQUENCY_MS = 1000; private static final int CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES = 8; - private static final int OP_FLAGS_PULLED = OP_FLAG_SELF | OP_FLAG_TRUSTED_PROXIED; + private static final int OP_FLAGS_PULLED = OP_FLAG_SELF | OP_FLAG_TRUSTED_PROXY; private static final String COMMON_PERMISSION_PREFIX = "android.permission."; private final Object mNetworkStatsLock = new Object(); -- cgit v1.2.3-59-g8ed1b