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

Commit 1066cc84 authored by Steve Pomeroy's avatar Steve Pomeroy Committed by Android (Google) Code Review
Browse files

Merge "Support empty role values in the RoleHolder atom" into main

parents fbefde0a f5fb9558

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

+16 −9
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import static android.net.NetworkTemplate.OEM_MANAGED_ALL; 
import static android.net.NetworkTemplate.OEM_MANAGED_PAID;

import static android.net.NetworkTemplate.OEM_MANAGED_PRIVATE;

import static android.os.Debug.getIonHeapsSizeKb;

import static android.os.Process.INVALID_UID;

import static android.os.Process.LAST_SHARED_APPLICATION_GID;

import static android.os.Process.SYSTEM_UID;

import static android.os.Process.getUidForPid;
@@ -3537,6 +3538,7 @@ public class StatsPullAtomService extends SystemService { 
                    String roleName = roleEntry.getKey();

                    Set<String> packageNames = roleEntry.getValue();



                    if (!packageNames.isEmpty()) {

                        for (String packageName : packageNames) {

                            PackageInfo pkg;

                            try {
@@ -3549,6 +3551,11 @@ public class StatsPullAtomService extends SystemService { 
                            pulledData.add(FrameworkStatsLog.buildStatsEvent(

                                    atomTag, pkg.applicationInfo.uid, packageName, roleName));

                        }

                    } else {

                        // Ensure that roles set to None are logged with an empty state.

                        pulledData.add(FrameworkStatsLog.buildStatsEvent(

                                atomTag, INVALID_UID, "", roleName));

                    }

                }

            }

        } finally {