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

Commit e4fd3216 authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Jeffrey Huang
Browse files

Migrate pullRoleHolder to new API 

Test: adb shell cmd stats pull-source 10049
Test: atest CtsStatsdHostTestCases:UidAtomTests#testRoleHolder
Bug: 145565211
Change-Id: I249140c5721e21fb4eabd29429e44758ead1a109
parent 97050e1c

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java

+0 −59
Original line number Diff line number Diff line
@@ -856,60 +856,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
        pulledData.add(e);

    }



    /**

     * Add a RoleHolder atom for each package that holds a role.

     *

     * @param elapsedNanos the time since boot

     * @param wallClockNanos the time on the clock

     * @param pulledData the data sink to write to

     */

    private void pullRoleHolders(long elapsedNanos, final long wallClockNanos,

            @NonNull List<StatsLogEventWrapper> pulledData) {

        long callingToken = Binder.clearCallingIdentity();

        try {

            PackageManager pm = mContext.getPackageManager();

            RoleManagerInternal rmi = LocalServices.getService(RoleManagerInternal.class);



            List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();



            int numUsers = users.size();

            for (int userNum = 0; userNum < numUsers; userNum++) {

                int userId = users.get(userNum).getUserHandle().getIdentifier();



                ArrayMap<String, ArraySet<String>> roles = rmi.getRolesAndHolders(

                        userId);



                int numRoles = roles.size();

                for (int roleNum = 0; roleNum < numRoles; roleNum++) {

                    String roleName = roles.keyAt(roleNum);

                    ArraySet<String> holders = roles.valueAt(roleNum);



                    int numHolders = holders.size();

                    for (int holderNum = 0; holderNum < numHolders; holderNum++) {

                        String holderName = holders.valueAt(holderNum);



                        PackageInfo pkg;

                        try {

                            pkg = pm.getPackageInfoAsUser(holderName, 0, userId);

                        } catch (PackageManager.NameNotFoundException e) {

                            Log.w(TAG, "Role holder " + holderName + " not found");

                            return;

                        }



                        StatsLogEventWrapper e = new StatsLogEventWrapper(StatsLog.ROLE_HOLDER,

                                elapsedNanos, wallClockNanos);

                        e.writeInt(pkg.applicationInfo.uid);

                        e.writeString(holderName);

                        e.writeString(roleName);

                        pulledData.add(e);

                    }

                }

            }

        } finally {

            Binder.restoreCallingIdentity(callingToken);

        }

    }



    private void pullExternalStorageInfo(int tagId, long elapsedNanos, long wallClockNanos,

            List<StatsLogEventWrapper> pulledData) {

        StorageManager storageManager = mContext.getSystemService(StorageManager.class);
@@ -1055,11 +1001,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
                break;

            }



            case StatsLog.ROLE_HOLDER: {

                pullRoleHolders(elapsedNanos, wallClockNanos, ret);

                break;

            }



            case StatsLog.EXTERNAL_STORAGE_INFO: {

                pullExternalStorageInfo(tagId, elapsedNanos, wallClockNanos, ret);

                break;

cmds/statsd/src/external/StatsPullerManager.cpp

+0 −4
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ std::map<PullerKey, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = { 
         {.additiveFields = {1, 2, 3, 4},

          .puller = new StatsCompanionServicePuller(android::util::DEBUG_FAILING_ELAPSED_CLOCK)}},



        // RoleHolder.

        {{.atomTag = android::util::ROLE_HOLDER},

         {.puller = new StatsCompanionServicePuller(android::util::ROLE_HOLDER)}},



        // TrainInfo.

        {{.atomTag = android::util::TRAIN_INFO}, {.puller = new TrainInfoPuller()}},

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

+53 −3
Original line number Diff line number Diff line
@@ -2218,11 +2218,61 @@ public class StatsPullAtomService extends SystemService { 
    }



    private void registerRoleHolder() {

        // No op.

        int tagId = StatsLog.ROLE_HOLDER;

        mStatsManager.registerPullAtomCallback(

                tagId,

                null, // use default PullAtomMetadata values

                (atomTag, data) -> pullRoleHolder(atomTag, data),

                BackgroundThread.getExecutor()

        );

    }



    private void pullRoleHolder() {

        // No op.

    // Add a RoleHolder atom for each package that holds a role.

    private int pullRoleHolder(int atomTag, List<StatsEvent> pulledData) {

        long callingToken = Binder.clearCallingIdentity();

        try {

            PackageManager pm = mContext.getPackageManager();

            RoleManagerInternal rmi = LocalServices.getService(RoleManagerInternal.class);



            List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();



            int numUsers = users.size();

            for (int userNum = 0; userNum < numUsers; userNum++) {

                int userId = users.get(userNum).getUserHandle().getIdentifier();



                ArrayMap<String, ArraySet<String>> roles = rmi.getRolesAndHolders(userId);



                int numRoles = roles.size();

                for (int roleNum = 0; roleNum < numRoles; roleNum++) {

                    String roleName = roles.keyAt(roleNum);

                    ArraySet<String> holders = roles.valueAt(roleNum);



                    int numHolders = holders.size();

                    for (int holderNum = 0; holderNum < numHolders; holderNum++) {

                        String holderName = holders.valueAt(holderNum);



                        PackageInfo pkg;

                        try {

                            pkg = pm.getPackageInfoAsUser(holderName, 0, userId);

                        } catch (PackageManager.NameNotFoundException e) {

                            Slog.w(TAG, "Role holder " + holderName + " not found");

                            return StatsManager.PULL_SKIP;

                        }



                        StatsEvent e = StatsEvent.newBuilder()

                                .setAtomId(atomTag)

                                .writeInt(pkg.applicationInfo.uid)

                                .writeString(holderName)

                                .writeString(roleName)

                                .build();

                        pulledData.add(e);

                    }

                }

            }

        } finally {

            Binder.restoreCallingIdentity(callingToken);

        }

        return StatsManager.PULL_SUCCESS;

    }



    private void registerDangerousPermissionState() {