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

Commit 050abc38 authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

Collect only AppOps self noted by app and proxied by trusted apps. 

Test: make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive 10060
Change-Id: I9a2e55d258ca37e13ea4a1d8618de29b7143d77e
parent 7f8743d5

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

+12 −10
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


package com.android.server.stats.pull;



import static android.app.AppOpsManager.OP_FLAGS_ALL_TRUSTED;

import static android.app.AppOpsManager.OP_FLAG_SELF;

import static android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXIED;

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

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

import static android.os.Debug.getIonHeapsSizeKb;
@@ -184,6 +185,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 final Object mNetworkStatsLock = new Object();

    @GuardedBy("mNetworkStatsLock")
@@ -2838,8 +2840,8 @@ public class StatsPullAtomService extends SystemService { 
            AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class);



            CompletableFuture<HistoricalOps> ops = new CompletableFuture<>();

            HistoricalOpsRequest histOpsRequest =

                    new HistoricalOpsRequest.Builder(0, Long.MAX_VALUE).build();

            HistoricalOpsRequest histOpsRequest = new HistoricalOpsRequest.Builder(0,

                    Long.MAX_VALUE).setFlags(OP_FLAGS_PULLED).build();

            appOps.getHistoricalOps(histOpsRequest, mContext.getMainExecutor(), ops::complete);



            HistoricalOps histOps = ops.get(EXTERNAL_STATS_SYNC_TIMEOUT_MILLIS,
@@ -2858,12 +2860,12 @@ public class StatsPullAtomService extends SystemService { 
                        e.writeInt(uid);

                        e.writeString(packageOps.getPackageName());

                        e.writeInt(op.getOpCode());

                        e.writeLong(op.getForegroundAccessCount(OP_FLAGS_ALL_TRUSTED));

                        e.writeLong(op.getBackgroundAccessCount(OP_FLAGS_ALL_TRUSTED));

                        e.writeLong(op.getForegroundRejectCount(OP_FLAGS_ALL_TRUSTED));

                        e.writeLong(op.getBackgroundRejectCount(OP_FLAGS_ALL_TRUSTED));

                        e.writeLong(op.getForegroundAccessDuration(OP_FLAGS_ALL_TRUSTED));

                        e.writeLong(op.getBackgroundAccessDuration(OP_FLAGS_ALL_TRUSTED));

                        e.writeLong(op.getForegroundAccessCount(OP_FLAGS_PULLED));

                        e.writeLong(op.getBackgroundAccessCount(OP_FLAGS_PULLED));

                        e.writeLong(op.getForegroundRejectCount(OP_FLAGS_PULLED));

                        e.writeLong(op.getBackgroundRejectCount(OP_FLAGS_PULLED));

                        e.writeLong(op.getForegroundAccessDuration(OP_FLAGS_PULLED));

                        e.writeLong(op.getBackgroundAccessDuration(OP_FLAGS_PULLED));



                        String perm = AppOpsManager.opToPermission(op.getOpCode());

                        if (perm == null) {