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

Commit 19894e33 authored by Cody Kesting's avatar Cody Kesting
Browse files

Improve CarrierPrivilegesTracker logging and dump. 

This change makes CarrierPrivilegesTracker logging more concise, and
also provides more information about the current state of the CPT on
dump(). Specifically, obfuscated packages and their certificate hashes
are only included in logs if the VDEBUG compile-time flag is set. dump()
is also updated to include CPT's current SIM-loaded and
Carrier-Privileged certs.

Bug: 157077047
Test: atest CarrierPrivilegesTrackerTest
Change-Id: I88166ddcb1d041940433fd15539dfa5d028a10b9
parent c8e082cd

src/java/com/android/internal/telephony/CarrierPrivilegesTracker.java

+14 −3
Original line number Original line Diff line number Diff line
@@ -77,6 +77,8 @@ import java.util.StringJoiner; 
public class CarrierPrivilegesTracker extends Handler {

public class CarrierPrivilegesTracker extends Handler {

    private static final String TAG = CarrierPrivilegesTracker.class.getSimpleName();

    private static final String TAG = CarrierPrivilegesTracker.class.getSimpleName();





    private static final boolean VDBG = false;



    private static final String SHA_1 = "SHA-1";

    private static final String SHA_1 = "SHA-1";

    private static final String SHA_256 = "SHA-256";

    private static final String SHA_256 = "SHA-256";
@@ -421,10 +423,13 @@ public class CarrierPrivilegesTracker extends Handler { 
        // Okay because no registrants exist yet

        // Okay because no registrants exist yet

        maybeUpdatePrivilegedUidsAndNotifyRegistrants();

        maybeUpdatePrivilegedUidsAndNotifyRegistrants();





        mLocalLog.log("Initializing state:"

        String msg = "Initializing state:"

                + " CarrierConfig certs=" + mCarrierConfigCerts

                + " CarrierConfig certs=" + mCarrierConfigCerts

                + " SIM-loaded certs=" + mUiccCerts

                + " SIM-loaded certs=" + mUiccCerts;

                + " installed pkgs=" + getObfuscatedPackages());

        if (VDBG) {

            msg += " installed pkgs=" + getObfuscatedPackages();

        }

        mLocalLog.log(msg);

    }

    }





    private String getObfuscatedPackages() {

    private String getObfuscatedPackages() {
@@ -512,6 +517,12 @@ public class CarrierPrivilegesTracker extends Handler { 
        pw.println("CarrierPrivilegesTracker - Log End ----");

        pw.println("CarrierPrivilegesTracker - Log End ----");

        pw.println("CarrierPrivilegesTracker - Privileged UIDs: "

        pw.println("CarrierPrivilegesTracker - Privileged UIDs: "

                + Arrays.toString(mPrivilegedUids));

                + Arrays.toString(mPrivilegedUids));

        pw.println("CarrierPrivilegesTracker - SIM-loaded Certs: " + mUiccCerts);

        pw.println("CarrierPrivilegesTracker - CarrierPrivileged Certs: " + mCarrierConfigCerts);

        if (VDBG) {

            pw.println("CarrierPrivilegesTracker - Obfuscated Pkgs + Certs: "

                    + getObfuscatedPackages());

        }

    }

    }





    /**

    /**