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

Commit 5b89b0ca authored by Arun Voddu's avatar Arun Voddu Committed by Android (Google) Code Review
Browse files

Merge "Provision to enable VDBG logs through mobile for UICC component." into main

parents 514d6279 0fbabd2b

src/java/com/android/internal/telephony/uicc/IccFileHandler.java

+7 −1
Original line number Diff line number Diff line
@@ -16,14 +16,18 @@ 


package com.android.internal.telephony.uicc;



import static com.android.internal.telephony.util.TelephonyUtils.FORCE_VERBOSE_STATE_LOGGING;



import android.compat.annotation.UnsupportedAppUsage;

import android.os.AsyncResult;

import android.os.Build;

import android.os.Handler;

import android.os.Message;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CommandsInterface;

import com.android.telephony.Rlog;



import java.util.ArrayList;
@@ -31,7 +35,9 @@ import java.util.ArrayList; 
 * {@hide}

 */

public abstract class IccFileHandler extends Handler implements IccConstants {

    private static final boolean VDBG = false;

    protected static final String LOG_TAG = "IccFileHandler";

    private static final boolean VDBG = FORCE_VERBOSE_STATE_LOGGING ||

            Rlog.isLoggable(LOG_TAG, Log.VERBOSE);



    //from TS 11.11 9.1 or elsewhere

    static protected final int COMMAND_READ_BINARY = 0xb0;

src/java/com/android/internal/telephony/uicc/IccRecords.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.internal.telephony.uicc;



import static com.android.internal.telephony.util.TelephonyUtils.FORCE_VERBOSE_STATE_LOGGING;



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -59,7 +61,6 @@ import java.util.concurrent.atomic.AtomicInteger; 
public abstract class IccRecords extends Handler implements IccConstants {

    private static final String LOG_TAG = "IccRecords";

    protected static final boolean DBG = true;

    private static final boolean FORCE_VERBOSE_STATE_LOGGING = false; /* stopship if true */

    protected static final boolean VDBG =  FORCE_VERBOSE_STATE_LOGGING ||

            Rlog.isLoggable(LOG_TAG, Log.VERBOSE);

src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
package com.android.internal.telephony.uicc;



import android.annotation.NonNull;



import static com.android.internal.telephony.util.TelephonyUtils.FORCE_VERBOSE_STATE_LOGGING;



import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.Intent;
@@ -46,7 +49,6 @@ public class IsimUiccRecords extends IccRecords implements IsimRecords { 
    protected static final String LOG_TAG = "IsimUiccRecords";



    private static final boolean DBG = true;

    private static final boolean FORCE_VERBOSE_STATE_LOGGING = false; /* stopship if true */

    private static final boolean VDBG =  FORCE_VERBOSE_STATE_LOGGING ||

            Rlog.isLoggable(LOG_TAG, Log.VERBOSE);

    private static final boolean DUMP_RECORDS = false;  // Note: PII is logged when this is true

src/java/com/android/internal/telephony/uicc/PinStorage.java

+4 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT 
import static com.android.internal.telephony.TelephonyStatsLog.PIN_STORAGE_EVENT__EVENT__PIN_VERIFICATION_SUCCESS;

import static com.android.internal.telephony.uicc.IccCardStatus.PinState.PINSTATE_ENABLED_NOT_VERIFIED;

import static com.android.internal.telephony.uicc.IccCardStatus.PinState.PINSTATE_ENABLED_VERIFIED;

import static com.android.internal.telephony.util.TelephonyUtils.FORCE_VERBOSE_STATE_LOGGING;



import android.annotation.Nullable;

import android.app.KeyguardManager;
@@ -56,6 +57,7 @@ import android.telephony.TelephonyManager; 
import android.telephony.TelephonyManager.SimState;

import android.util.Base64;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.SparseArray;



import com.android.internal.R;
@@ -88,7 +90,8 @@ import javax.crypto.spec.GCMParameterSpec; 
 */

public class PinStorage extends Handler {

    private static final String TAG = "PinStorage";

    private static final boolean VDBG = false;  // STOPSHIP if true

    private static final boolean VDBG = FORCE_VERBOSE_STATE_LOGGING ||

            Rlog.isLoggable(TAG, Log.VERBOSE);



    /**

     * Time duration in milliseconds to allow automatic PIN verification after reboot. All unused

src/java/com/android/internal/telephony/uicc/SIMRecords.java

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.internal.telephony.uicc; 
import static android.telephony.SmsManager.STATUS_ON_ICC_READ;

import static android.telephony.SmsManager.STATUS_ON_ICC_UNREAD;



import static com.android.internal.telephony.util.TelephonyUtils.FORCE_VERBOSE_STATE_LOGGING;



import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.Resources;
@@ -57,7 +59,6 @@ public class SIMRecords extends IccRecords { 
    protected static final String LOG_TAG = "SIMRecords";



    private static final boolean CRASH_RIL = false;

    private static final boolean FORCE_VERBOSE_STATE_LOGGING = false; /* stopship if true */

    private static final boolean VDBG = FORCE_VERBOSE_STATE_LOGGING ||

            Rlog.isLoggable(LOG_TAG, Log.VERBOSE);