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

Commit 48928ed7 authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

Remove duplicate code. 

Fix mistake made in ag/10483288 which reintroduced
previously deleted code.

Bug: 143519689
Test: atest UidAtomTests#testAppOps
Change-Id: I4de6f7d0fdf0b6dff29f2acee523add28bfc3312
parent d6503d5c

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

+0 −38
Original line number Diff line number Diff line
@@ -2840,44 +2840,6 @@ public class StatsPullAtomService extends SystemService { 
            HistoricalOps histOps = ops.get(EXTERNAL_STATS_SYNC_TIMEOUT_MILLIS,

                    TimeUnit.MILLISECONDS);

            processHistoricalOps(histOps, atomTag, pulledData);



            for (int uidIdx = 0; uidIdx < histOps.getUidCount(); uidIdx++) {

                final HistoricalUidOps uidOps = histOps.getUidOpsAt(uidIdx);

                final int uid = uidOps.getUid();

                for (int pkgIdx = 0; pkgIdx < uidOps.getPackageCount(); pkgIdx++) {

                    final HistoricalPackageOps packageOps = uidOps.getPackageOpsAt(pkgIdx);

                    for (int opIdx = 0; opIdx < packageOps.getOpCount(); opIdx++) {

                        final AppOpsManager.HistoricalOp op = packageOps.getOpAt(opIdx);



                        StatsEvent.Builder e = StatsEvent.newBuilder();

                        e.setAtomId(atomTag);

                        e.writeInt(uid);

                        e.writeString(packageOps.getPackageName());

                        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));

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

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

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



                        String perm = AppOpsManager.opToPermission(op.getOpCode());

                        if (perm == null) {

                            e.writeBoolean(false);

                        } else {

                            PermissionInfo permInfo;

                            try {

                                permInfo = mContext.getPackageManager().getPermissionInfo(perm, 0);

                                e.writeBoolean(permInfo.getProtection() == PROTECTION_DANGEROUS);

                            } catch (PackageManager.NameNotFoundException exception) {

                                e.writeBoolean(false);

                            }

                        }



                        pulledData.add(e.build());

                    }

                }

            }

        } catch (Throwable t) {

            // TODO: catch exceptions at a more granular level

            Slog.e(TAG, "Could not read appops", t);