commit d95261ead25f5fb31c484deb88944a3eb33fcc92
author Cody Kesting <ckesting@google.com> Thu May 21 17:41:16 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 21 17:41:16 2020 +0000
tree 0e76410a38a1d86a5f52e8ed6bac8028fe3a65cf
parent 5d410cfa1257f8a9270306d3d96fe4ad14df1fde
parent a2b0eee3caa394eba5d07506388813a422a7d4ea

Merge "Improve CarrierPrivilegesTracker logging and dump." am: 9365a6584b am: 385d68d882 am: 0522616152 am: a9632c9080 am: a2b0eee3ca

Change-Id: Ied90841739d0e9cb7ea9775c5427d20b1f9b00ea

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

diff --git a/src/java/com/android/internal/telephony/CarrierPrivilegesTracker.java b/src/java/com/android/internal/telephony/CarrierPrivilegesTracker.java
index 502d1c8..329e5f2 100644
--- a/src/java/com/android/internal/telephony/CarrierPrivilegesTracker.java
+++ b/src/java/com/android/internal/telephony/CarrierPrivilegesTracker.java
@@ -77,6 +77,8 @@
 public class CarrierPrivilegesTracker extends Handler {
     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_256 = "SHA-256";
 
@@ -421,10 +423,13 @@
         // Okay because no registrants exist yet
         maybeUpdatePrivilegedUidsAndNotifyRegistrants();
 
-        mLocalLog.log("Initializing state:"
+        String msg = "Initializing state:"
                 + " CarrierConfig certs=" + mCarrierConfigCerts
-                + " SIM-loaded certs=" + mUiccCerts
-                + " installed pkgs=" + getObfuscatedPackages());
+                + " SIM-loaded certs=" + mUiccCerts;
+        if (VDBG) {
+            msg += " installed pkgs=" + getObfuscatedPackages();
+        }
+        mLocalLog.log(msg);
     }
 
     private String getObfuscatedPackages() {
@@ -512,6 +517,12 @@
         pw.println("CarrierPrivilegesTracker - Log End ----");
         pw.println("CarrierPrivilegesTracker - Privileged UIDs: "
                 + 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());
+        }
     }
 
     /**