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

Commit 732d93a0 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Revert "Fix AppOps collection bug."" into rvc-dev am: 67456284... 

Merge "Merge "Revert "Fix AppOps collection bug."" into rvc-dev am: 67456284 am: 7200c5d5 am: 7f62f74e" into rvc-qpr-dev-plus-aosp
parents 6eb6bf4c ee6c2e70

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

+2 −2
Original line number Diff line number Diff line
@@ -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_PROXY;

import static android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXIED;

import static android.app.usage.NetworkStatsManager.FLAG_AUGMENT_WITH_SUBSCRIPTION_PLAN;

import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED;

import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS;
@@ -216,7 +216,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_PROXY;

    private static final int OP_FLAGS_PULLED = OP_FLAG_SELF | OP_FLAG_TRUSTED_PROXIED;

    private static final String COMMON_PERMISSION_PREFIX = "android.permission.";

    private static final String APP_OPS_TARGET_COLLECTION_SIZE = "app_ops_target_collection_size";

    private static final String DANGEROUS_PERMISSION_STATE_SAMPLE_RATE =