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

Commit 6266fc0e authored by Junda Liu's avatar Junda Liu Committed by Android (Google) Code Review
Browse files

Merge "Add localLog to UiccCard to record logical channel open/close." into mnc-dev

parents 44383185 7129f582

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

+16 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.Signature;

import android.content.res.Resources;

import android.os.AsyncResult;

import android.os.Binder;

import android.os.Handler;

import android.os.Message;

import android.os.PowerManager;
@@ -36,6 +37,7 @@ import android.preference.PreferenceManager; 
import android.telephony.Rlog;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.LocalLog;

import android.view.WindowManager;



import com.android.internal.telephony.CommandsInterface;
@@ -94,6 +96,8 @@ public class UiccCard { 
    private static final int EVENT_SIM_IO_DONE = 19;

    private static final int EVENT_CARRIER_PRIVILIGES_LOADED = 20;



    private static final LocalLog mLocalLog = new LocalLog(100);



    private int mPhoneId;



    public UiccCard(Context c, CommandsInterface ci, IccCardStatus ics) {
@@ -364,7 +368,7 @@ public class UiccCard { 
                case EVENT_SIM_IO_DONE:

                    AsyncResult ar = (AsyncResult)msg.obj;

                    if (ar.exception != null) {

                       if (DBG)

                        loglocal("Exception: " + ar.exception);

                        log("Error in SIM access with exception" + ar.exception);

                    }

                    AsyncResult.forMessage((Message)ar.userObj, ar.result, ar.exception);
@@ -483,6 +487,8 @@ public class UiccCard { 
     * Exposes {@link CommandsInterface.iccOpenLogicalChannel}

     */

    public void iccOpenLogicalChannel(String AID, Message response) {

        loglocal("Open Logical Channel: " + AID + " by pid:" + Binder.getCallingPid()

                + " uid:" + Binder.getCallingUid());

        mCi.iccOpenLogicalChannel(AID,

                mHandler.obtainMessage(EVENT_OPEN_LOGICAL_CHANNEL_DONE, response));

    }
@@ -491,6 +497,7 @@ public class UiccCard { 
     * Exposes {@link CommandsInterface.iccCloseLogicalChannel}

     */

    public void iccCloseLogicalChannel(int channel, Message response) {

        loglocal("Close Logical Channel: " + channel);

        mCi.iccCloseLogicalChannel(channel,

                mHandler.obtainMessage(EVENT_CLOSE_LOGICAL_CHANNEL_DONE, response));

    }
@@ -639,6 +646,10 @@ public class UiccCard { 
        Rlog.e(LOG_TAG, msg);

    }



    private void loglocal(String msg) {

        if (DBG) mLocalLog.log(msg);

    }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("UiccCard:");

        pw.println(" mCi=" + mCi);
@@ -699,5 +710,8 @@ public class UiccCard { 
                    + ((Registrant)mCarrierPrivilegeRegistrants.get(i)).getHandler());

        }

        pw.flush();

        pw.println("mLocalLog:");

        mLocalLog.dump(fd, pw, args);

        pw.flush();

    }

}