Merge "Telephony: Add uicc debug info to DebugService" (aa54f8e0) · Commits · e / os / android_frameworks_opt_telephony

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,9 @@ package com.android.internal.telephony;

		import android.telephony.Rlog;

		import com.android.internal.telephony.uicc.UiccController;
		import com.android.internal.telephony.uicc.IccCardProxy;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;

		@@ -99,6 +102,20 @@ public class DebugService {
		}
		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		try {
		UiccController.getInstance().dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}
		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		try {
		((IccCardProxy)phoneProxy.getIccCard()).dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}
		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		log("dump: -");
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3872,7 +3872,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("RIL:");
		pw.println("RIL: " + this);
		pw.println(" mSocket=" + mSocket);
		pw.println(" mSenderThread=" + mSenderThread);
		pw.println(" mSender=" + mSender);

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

+36 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,9 @@ import com.android.internal.telephony.uicc.IccCardStatus.CardState;
		import com.android.internal.telephony.uicc.IccCardStatus.PinState;
		import com.android.internal.telephony.uicc.UiccController;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;

		import static com.android.internal.telephony.TelephonyProperties.PROPERTY_SIM_STATE;

		/**
		@@ -699,4 +702,37 @@ public class IccCardProxy extends Handler implements IccCard {
		private void loge(String msg) {
		Rlog.e(LOG_TAG, msg);
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("IccCardProxy: " + this);
		pw.println(" mContext=" + mContext);
		pw.println(" mCi=" + mCi);
		pw.println(" mAbsentRegistrants: size=" + mAbsentRegistrants.size());
		for (int i = 0; i < mAbsentRegistrants.size(); i++) {
		pw.println(" mAbsentRegistrants[" + i + "]="
		+ ((Registrant)mAbsentRegistrants.get(i)).getHandler());
		}
		pw.println(" mPinLockedRegistrants: size=" + mPinLockedRegistrants.size());
		for (int i = 0; i < mPinLockedRegistrants.size(); i++) {
		pw.println(" mPinLockedRegistrants[" + i + "]="
		+ ((Registrant)mPinLockedRegistrants.get(i)).getHandler());
		}
		pw.println(" mNetworkLockedRegistrants: size=" + mNetworkLockedRegistrants.size());
		for (int i = 0; i < mNetworkLockedRegistrants.size(); i++) {
		pw.println(" mNetworkLockedRegistrants[" + i + "]="
		+ ((Registrant)mNetworkLockedRegistrants.get(i)).getHandler());
		}
		pw.println(" mCurrentAppType=" + mCurrentAppType);
		pw.println(" mUiccController=" + mUiccController);
		pw.println(" mUiccCard=" + mUiccCard);
		pw.println(" mUiccApplication=" + mUiccApplication);
		pw.println(" mIccRecords=" + mIccRecords);
		pw.println(" mCdmaSSM=" + mCdmaSSM);
		pw.println(" mRadioOn=" + mRadioOn);
		pw.println(" mQuietMode=" + mQuietMode);
		pw.println(" mInitialized=" + mInitialized);
		pw.println(" mExternalState=" + mExternalState);

		pw.flush();
		}
		}

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

+53 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ import android.os.RegistrantList;

		import com.android.internal.telephony.CommandsInterface;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.concurrent.atomic.AtomicBoolean;

		/**
		@@ -442,4 +444,55 @@ public abstract class IccRecords extends Handler implements IccConstants {
		public UsimServiceTable getUsimServiceTable() {
		return null;
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("IccRecords: " + this);
		pw.println(" mDestroyed=" + mDestroyed);
		pw.println(" mCi=" + mCi);
		pw.println(" mFh=" + mFh);
		pw.println(" mParentApp=" + mParentApp);
		pw.println(" recordsLoadedRegistrants: size=" + recordsLoadedRegistrants.size());
		for (int i = 0; i < recordsLoadedRegistrants.size(); i++) {
		pw.println(" recordsLoadedRegistrants[" + i + "]="
		+ ((Registrant)recordsLoadedRegistrants.get(i)).getHandler());
		}
		pw.println(" mImsiReadyRegistrants: size=" + mImsiReadyRegistrants.size());
		for (int i = 0; i < mImsiReadyRegistrants.size(); i++) {
		pw.println(" mImsiReadyRegistrants[" + i + "]="
		+ ((Registrant)mImsiReadyRegistrants.get(i)).getHandler());
		}
		pw.println(" mRecordsEventsRegistrants: size=" + mRecordsEventsRegistrants.size());
		for (int i = 0; i < mRecordsEventsRegistrants.size(); i++) {
		pw.println(" mRecordsEventsRegistrants[" + i + "]="
		+ ((Registrant)mRecordsEventsRegistrants.get(i)).getHandler());
		}
		pw.println(" mNewSmsRegistrants: size=" + mNewSmsRegistrants.size());
		for (int i = 0; i < mNewSmsRegistrants.size(); i++) {
		pw.println(" mNewSmsRegistrants[" + i + "]="
		+ ((Registrant)mNewSmsRegistrants.get(i)).getHandler());
		}
		pw.println(" mNetworkSelectionModeAutomaticRegistrants: size="
		+ mNetworkSelectionModeAutomaticRegistrants.size());
		for (int i = 0; i < mNetworkSelectionModeAutomaticRegistrants.size(); i++) {
		pw.println(" mNetworkSelectionModeAutomaticRegistrants[" + i + "]="
		+ ((Registrant)mNetworkSelectionModeAutomaticRegistrants.get(i)).getHandler());
		}
		pw.println(" recordsRequested=" + recordsRequested);
		pw.println(" recordsToLoad=" + recordsToLoad);
		pw.println(" adnCache=" + adnCache);
		pw.println(" iccid=" + iccid);
		pw.println(" msisdn=" + msisdn);
		pw.println(" msisdnTag=" + msisdnTag);
		pw.println(" voiceMailNum=" + voiceMailNum);
		pw.println(" voiceMailTag=" + voiceMailTag);
		pw.println(" newVoiceMailNum=" + newVoiceMailNum);
		pw.println(" newVoiceMailTag=" + newVoiceMailTag);
		pw.println(" isVoiceMailFixed=" + isVoiceMailFixed);
		pw.println(" countVoiceMessages=" + countVoiceMessages);
		pw.println(" mImsi=" + mImsi);
		pw.println(" mncLength=" + mncLength);
		pw.println(" mailboxIndex=" + mailboxIndex);
		pw.println(" spn=" + spn);
		pw.flush();
		}
		}

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -26,8 +26,11 @@ import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.gsm.SimTlv;
		//import com.android.internal.telephony.gsm.VoiceMailConstants;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.nio.charset.Charset;
		import java.util.ArrayList;
		import java.util.Arrays;

		import static com.android.internal.telephony.uicc.IccConstants.EF_DOMAIN;
		import static com.android.internal.telephony.uicc.IccConstants.EF_IMPI;
		@@ -263,4 +266,15 @@ public final class IsimUiccRecords extends IccRecords implements IsimRecords {
		protected void loge(String s) {
		if (DBG) Rlog.e(LOG_TAG, "[ISIM] " + s);
		}

		@Override
		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("IsimRecords: " + this);
		pw.println(" extends:");
		super.dump(fd, pw, args);
		pw.println(" mIsimImpi=" + mIsimImpi);
		pw.println(" mIsimDomain=" + mIsimDomain);
		pw.println(" mIsimImpu[]=" + Arrays.toString(mIsimImpu));
		pw.flush();
		}
		}