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

Commit ba543689 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Revert "Change operation id from integer to string representation""

parents d8bef18e 6c218db6
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -466,8 +466,8 @@ message Atom {
        DangerousPermissionStateSampled dangerous_permission_state_sampled =
                10067 [(module) = "framework"];
        GraphicsStats graphics_stats = 10068;
        RuntimeAppOpAccess runtime_app_op_access = 10069 [(module) = "framework"];
        IonHeapSize ion_heap_size = 10070;
        RuntimeAppOpsAccess runtime_app_ops_access = 10069;
        IonHeapSize ion_heap_size = 10070 [(module) = "framework"];
    }

    // DO NOT USE field numbers above 100,000 in AOSP.
@@ -8132,15 +8132,15 @@ message GraphicsStats {
/**
 * Message related to dangerous (runtime) app ops access
 */
message RuntimeAppOpAccess {
message RuntimeAppOpsAccess {
    // Uid of the package accessing app op
    optional int32 uid = 1 [(is_uid) = true];

    // Name of the package accessing app op
    optional string package_name = 2;

    // operation string id per OPSTR_ constants in AppOpsManager.java
    optional string op = 3;
    // operation id; maps to the OP_* constants in AppOpsManager.java
    optional int32 op_id = 3;

    // feature id; provided by developer when accessing related API, limited at 50 chars by API.
    // Features must be provided through manifest using <feature> tag available in R and above.