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

Commit 4b50780f authored by Thomas Stuart's avatar Thomas Stuart Committed by Automerger Merge Worker
Browse files

Merge "Pii info logging cleanup in SubscriptionManager" into tm-dev am: b61b5dfd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17059673

Change-Id: Ie52e026038f4e09005345c0ff97df19810250d4f
parents bb3b2d27 b61b5dfd

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

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

 */

public class SubscriptionController extends ISub.Stub {

public class SubscriptionController extends ISub.Stub {

    private static final String LOG_TAG = "SubscriptionController";

    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 VDBG = Rlog.isLoggable(LOG_TAG, Log.VERBOSE);

    private static final boolean DBG_CACHE = false;

    private static final boolean DBG_CACHE = false;

    private static final int DEPRECATED_SETTING = -1;

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

                    if (DBG) {

                        logd("[getActiveSubscriptionInfoForSimSlotIndex]+ slotIndex="

                        logd("[getActiveSubscriptionInfoForSimSlotIndex]+ slotIndex="

                                + slotIndex + " subId=" + si);

                                + slotIndex + " subId=" + si);

                    } else {

                        logd("[getActiveSubscriptionInfoForSimSlotIndex]+ slotIndex="

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

                                false));

                    }

                    }

                    return conditionallyRemoveIdentifiers(si, callingPackage, callingFeatureId,

                    return conditionallyRemoveIdentifiers(si, callingPackage, callingFeatureId,

                            "getActiveSubscriptionInfoForSimSlotIndex");

                            "getActiveSubscriptionInfoForSimSlotIndex");