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

Commit 7200c5d5 authored by Claudio Martella's avatar Claudio Martella Committed by Automerger Merge Worker
Browse files

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

Change-Id: Ie0a9539c05557c6e2417875cf280c7d9019a8149
parents e0c655c4 67456284

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.stats.pull;

package com.android.server.stats.pull;





import static android.app.AppOpsManager.OP_FLAG_SELF;

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.app.usage.NetworkStatsManager.FLAG_AUGMENT_WITH_SUBSCRIPTION_PLAN;

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

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

import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS;

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 MAX_BATTERY_STATS_HELPER_FREQUENCY_MS = 1000;

    private static final int CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES = 8;

    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 COMMON_PERMISSION_PREFIX = "android.permission.";

    private static final String APP_OPS_TARGET_COLLECTION_SIZE = "app_ops_target_collection_size";

    private static final String APP_OPS_TARGET_COLLECTION_SIZE = "app_ops_target_collection_size";

    private static final String DANGEROUS_PERMISSION_STATE_SAMPLE_RATE =

    private static final String DANGEROUS_PERMISSION_STATE_SAMPLE_RATE =