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

Commit 05caf9ab authored by Stanislav Zholnin's avatar Stanislav Zholnin Committed by Automerger Merge Worker
Browse files

Merge "Remove filtering of DiscreteRegistry events by uid." into sc-dev am:... 

Merge "Remove filtering of DiscreteRegistry events by uid." into sc-dev am: 559abf3b am: 3bf79d2c am: 0f383a65

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14690891

Change-Id: I4551afbc9f44abe3319705eb2cda689df302eec8
parents 2fa958ef 0f383a65

services/core/java/com/android/server/appop/DiscreteRegistry.java

+2 −13
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.os.AsyncTask; 
import android.os.Build;

import android.os.Environment;

import android.os.FileUtils;

import android.os.Process;

import android.provider.DeviceConfig;

import android.util.ArrayMap;

import android.util.AtomicFile;
@@ -229,7 +228,7 @@ final class DiscreteRegistry { 
    void recordDiscreteAccess(int uid, String packageName, int op, @Nullable String attributionTag,

            @AppOpsManager.OpFlags int flags, @AppOpsManager.UidState int uidState, long accessTime,

            long accessDuration) {

        if (!isDiscreteOp(op, uid, flags)) {

        if (!isDiscreteOp(op, flags)) {

            return;

        }

        synchronized (mInMemoryLock) {
@@ -1046,26 +1045,16 @@ final class DiscreteRegistry { 
        return result;

    }



    private static boolean isDiscreteOp(int op, int uid, @AppOpsManager.OpFlags int flags) {

    private static boolean isDiscreteOp(int op, @AppOpsManager.OpFlags int flags) {

        if (!ArrayUtils.contains(sDiscreteOps, op)) {

            return false;

        }

        if (!isDiscreteUid(uid)) {

            return false;

        }

        if ((flags & (sDiscreteFlags)) == 0) {

            return false;

        }

        return true;

    }



    private static boolean isDiscreteUid(int uid) {

        if (uid < Process.FIRST_APPLICATION_UID) {

            return false;

        }

        return true;

    }



    void setDebugMode(boolean debugMode) {

        this.mDebugMode = debugMode;

    }