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

Commit 6c0c372d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove separate OpIds for logging and enforce op ids instead."

parents 333bd96c 6703323c

core/java/android/app/AppOpsManager.java

+120 −226

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Diff line number Diff line
@@ -1705,7 +1705,7 @@ public final class ActiveServices { 
                    if (acceptances > 0 ||  rejections > 0) {

                        FrameworkStatsLog.write(

                                FrameworkStatsLog.FOREGROUND_SERVICE_APP_OP_SESSION_ENDED,

                                mProcessRecord.uid, AppOpsManager.opToLoggingId(op),

                                mProcessRecord.uid, op,

                                modeToEnum(mAppOpModes.get(op)),

                                acceptances, rejections

                        );

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+2 −2
Original line number Diff line number Diff line
@@ -2901,7 +2901,7 @@ public class StatsPullAtomService extends SystemService { 
                        e.setAtomId(atomTag);

                        e.writeInt(uid);

                        e.writeString(packageOps.getPackageName());

                        e.writeInt(op.getLoggingOpCode());

                        e.writeInt(op.getOpCode());

                        e.writeLong(op.getForegroundAccessCount(OP_FLAGS_PULLED));

                        e.writeLong(op.getBackgroundAccessCount(OP_FLAGS_PULLED));

                        e.writeLong(op.getForegroundRejectCount(OP_FLAGS_PULLED));
@@ -3044,7 +3044,7 @@ public class StatsPullAtomService extends SystemService { 
        if (atomTag == FrameworkStatsLog.ATTRIBUTED_APP_OPS) {

            e.writeString(attributionTag);

        }

        e.writeInt(op.getLoggingOpCode());

        e.writeInt(op.getOpCode());

        e.writeLong(op.getForegroundAccessCount(OP_FLAGS_PULLED));

        e.writeLong(op.getBackgroundAccessCount(OP_FLAGS_PULLED));

        e.writeLong(op.getForegroundRejectCount(OP_FLAGS_PULLED));