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

Merge "Add AppOpEnum field to represent op_id in RuntimeAppOpAccess atom." into rvc-dev

Browse Source
This commit is contained in:
Stanislav Zholnin
2020-04-05 13:35:03 +00:00
committed by Android (Google) Code Review
parent 2758c6a056 3a2a6e4f1c
commit 03aa32160d
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmds/statsd/src/atoms.proto
View File

@@ -8697,13 +8697,12 @@ message RuntimeAppOpAccess {
// Name of the package accessing app op // Name of the package accessing app op
optional string package_name = 2; optional string package_name = 2;
// operation string id per OPSTR_ constants in AppOpsManager.java // deprecated - set to empty string
optional string op = 3; optional string op_deprecated = 3 [deprecated = true];
// attribution_tag; provided by developer when accessing related API, limited at 50 chars by // attribution_tag; provided by developer when accessing related API, limited at 50 chars by
// API. // API. Attributions must be provided through manifest using <attribution> tag available in R
// Attributions must be provided through manifest using <attribution> tag available in R and // and above.
// above.
optional string attribution_tag = 4; optional string attribution_tag = 4;
// message related to app op access, limited to 600 chars by API // message related to app op access, limited to 600 chars by API
@@ -8718,6 +8717,9 @@ message RuntimeAppOpAccess {
// sampling strategy used to collect this message // sampling strategy used to collect this message
optional SamplingStrategy sampling_strategy = 6; optional SamplingStrategy sampling_strategy = 6;
// operation id
optional android.app.AppOpEnum op = 7 [default = APP_OP_NONE];
} }
/* /*

3
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -3039,7 +3039,7 @@ public class StatsPullAtomService extends SystemService {
e.writeInt(message.getUid()); e.writeInt(message.getUid());
e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true); e.addBooleanAnnotation(ANNOTATION_ID_IS_UID, true);
e.writeString(message.getPackageName()); e.writeString(message.getPackageName());
e.writeString(message.getOp()); e.writeString("");
if (message.getAttributionTag() == null) { if (message.getAttributionTag() == null) {
e.writeString(""); e.writeString("");
} else { } else {
@@ -3047,6 +3047,7 @@ public class StatsPullAtomService extends SystemService {
} }
e.writeString(message.getMessage()); e.writeString(message.getMessage());
e.writeInt(message.getSamplingStrategy()); e.writeInt(message.getSamplingStrategy());
e.writeInt(AppOpsManager.strOpToOp(message.getOp()));
pulledData.add(e.build()); pulledData.add(e.build());
} catch (Throwable t) { } catch (Throwable t) {