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

Merge "Allow listening for noted Ops if app is sampled for Stack trace collection." into rvc-dev am: ae4605eee8 am: 0807ec1f69

Browse Source 
Change-Id: I9f7b87856cd1bcfcc0ddeabfa9356ed259f8a4c7
This commit is contained in:
Stanislav Zholnin
2020-04-20 15:37:37 +00:00
committed by Automerger Merge Worker
parent 6fb99083aa 0807ec1f69
commit 20aebac1a7
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/app/AppOpsManager.java
View File

@@ -233,12 +233,9 @@ public class AppOpsManager {
}
private void reportStackTraceIfNeeded(@NonNull SyncNotedAppOp op) {
if (sConfig.getSampledOpCode() == OP_NONE
&& sConfig.getExpirationTimeSinceBootMillis()
>= SystemClock.elapsedRealtime()) {
if (!isCollectingStackTraces()) {
return;
}
MessageSamplingConfig config = sConfig;
if (leftCircularDistance(strOpToOp(op.getOp()), config.getSampledOpCode(),
_NUM_OP) <= config.getAcceptableLeftDistance()
@@ -8181,7 +8178,22 @@ public class AppOpsManager {
* @hide
*/
public static boolean isListeningForOpNoted() {
return sOnOpNotedCallback != null;
return sOnOpNotedCallback != null || isCollectingStackTraces();
}
/**
* @return {@code true} iff the process is currently sampled for stacktrace collection.
*
* @see #setOnOpNotedCallback
*
* @hide
*/
private static boolean isCollectingStackTraces() {
if (sConfig.getSampledOpCode() == OP_NONE &&
sConfig.getExpirationTimeSinceBootMillis() >= SystemClock.elapsedRealtime()) {
return false;
}
return true;
}
/**