Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5d4c8425247562c07fb410ee5ae8fffd25321fb4
This commit is contained in:
Stanislav Zholnin
2021-05-24 16:01:23 +00:00
committed by Automerger Merge Worker
parent 49c78e3823 559abf3b1a
commit 3bf79d2cfd
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/appop/DiscreteRegistry.java
View File

@@ -43,7 +43,6 @@ import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.FileUtils; import android.os.FileUtils;
import android.os.Process;
import android.provider.DeviceConfig; import android.provider.DeviceConfig;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.AtomicFile; import android.util.AtomicFile;
@@ -229,7 +228,7 @@ final class DiscreteRegistry {
void recordDiscreteAccess(int uid, String packageName, int op, @Nullable String attributionTag, void recordDiscreteAccess(int uid, String packageName, int op, @Nullable String attributionTag,
@AppOpsManager.OpFlags int flags, @AppOpsManager.UidState int uidState, long accessTime, @AppOpsManager.OpFlags int flags, @AppOpsManager.UidState int uidState, long accessTime,
long accessDuration) { long accessDuration) {
if (!isDiscreteOp(op, uid, flags)) { if (!isDiscreteOp(op, flags)) {
return; return;
} }
synchronized (mInMemoryLock) { synchronized (mInMemoryLock) {
@@ -1046,26 +1045,16 @@ final class DiscreteRegistry {
return result; 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)) { if (!ArrayUtils.contains(sDiscreteOps, op)) {
return false; return false;
} }
if (!isDiscreteUid(uid)) {
return false;
}
if ((flags & (sDiscreteFlags)) == 0) { if ((flags & (sDiscreteFlags)) == 0) {
return false; return false;
} }
return true; return true;
} }
private static boolean isDiscreteUid(int uid) {
if (uid < Process.FIRST_APPLICATION_UID) {
return false;
}
return true;
}
void setDebugMode(boolean debugMode) { void setDebugMode(boolean debugMode) {
this.mDebugMode = debugMode; this.mDebugMode = debugMode;
} }