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

Commit d7783c15 authored by Thomas Stuart's avatar Thomas Stuart
Browse files

Pii info logging cleanup in SubscriptionManager 

A BR showed that some PII was being logged in
SubscriptionManager#getActiveSubscriptionInfoForSimSlotIndex.
After examination, it looks like the DBG var was set to true
and never set back to false causing PII to be logged.

bug: 189354214
Test: none
Change-Id: I9bde1a464d566ed7f2d178848100b5d38ffd8f21
parent ff5b10fb

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

+5 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ import java.util.stream.Collectors; 
 */

public class SubscriptionController extends ISub.Stub {

    private static final String LOG_TAG = "SubscriptionController";

    private static final boolean DBG = true;

    private static final boolean DBG = false;

    private static final boolean VDBG = Rlog.isLoggable(LOG_TAG, Log.VERBOSE);

    private static final boolean DBG_CACHE = false;

    private static final int DEPRECATED_SETTING = -1;
@@ -889,6 +889,10 @@ public class SubscriptionController extends ISub.Stub { 
                    if (DBG) {

                        logd("[getActiveSubscriptionInfoForSimSlotIndex]+ slotIndex="

                                + slotIndex + " subId=" + si);

                    } else {

                        logd("[getActiveSubscriptionInfoForSimSlotIndex]+ slotIndex="

                                + slotIndex + " subId=" + conditionallyRemoveIdentifiers(si, false,

                                false));

                    }

                    return conditionallyRemoveIdentifiers(si, callingPackage, callingFeatureId,

                            "getActiveSubscriptionInfoForSimSlotIndex");