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

Commit f6d4cd2e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix AppOps collection bug." into rvc-dev am: fdd209e9 am: ef9786ba am: 9b18463b 

Change-Id: Id063186616bd00d2061682db0513dba480707b5e
parents e0bda203 9b18463b

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_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();