diff options
| author | 2020-03-03 07:14:52 +0000 | |
|---|---|---|
| committer | 2020-03-03 07:14:52 +0000 | |
| commit | fdd209e94b320a685e2e793f2e6dd12102012a11 (patch) | |
| tree | f4b522c6d77f2021849563cb612fc0054317b0ad | |
| parent | 147a229ab86fcc65ef3b69e6f8ee3a59e5a3ca18 (diff) | |
| parent | d20eacc040477fba45e35dd1779241b514df9980 (diff) | |
Merge "Fix AppOps collection bug." into rvc-dev
| -rw-r--r-- | services/core/java/com/android/server/stats/pull/StatsPullAtomService.java | 4 |
1 files 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 9c4391cf8ac3..612989f76cd3 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(); |