Merge "Add enhanced log for sim slot information" am: 98debea0fa (ed5a07bc) · Commits · e / os / android_frameworks_opt_telephony

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -434,12 +434,20 @@ public class IsimUiccRecords extends IccRecords implements IsimRecords {
		@UnsupportedAppUsage
		@Override
		protected void log(String s) {
		if (DBG) Rlog.d(LOG_TAG, "[ISIM] " + s);
		if (mParentApp != null) {
		Rlog.d(LOG_TAG, "[ISIM-" + mParentApp.getPhoneId() + "] " + s);
		} else {
		Rlog.d(LOG_TAG, "[ISIM] " + s);
		}
		}

		@Override
		protected void loge(String s) {
		if (DBG) Rlog.e(LOG_TAG, "[ISIM] " + s);
		if (mParentApp != null) {
		Rlog.e(LOG_TAG, "[ISIM-" + mParentApp.getPhoneId() + "] " + s);
		} else {
		Rlog.e(LOG_TAG, "[ISIM] " + s);
		}
		}

		@Override

+10 −2

Original line number	Diff line number	Diff line
		@@ -964,14 +964,22 @@ public class RuimRecords extends IccRecords {
		@UnsupportedAppUsage
		@Override
		protected void log(String s) {
		if (mParentApp != null) {
		Rlog.d(LOG_TAG, "[RuimRecords-" + mParentApp.getPhoneId() + "] " + s);
		} else {
		Rlog.d(LOG_TAG, "[RuimRecords] " + s);
		}
		}

		@UnsupportedAppUsage
		@Override
		protected void loge(String s) {
		if (mParentApp != null) {
		Rlog.e(LOG_TAG, "[RuimRecords-" + mParentApp.getPhoneId() + "] " + s);
		} else {
		Rlog.e(LOG_TAG, "[RuimRecords] " + s);
		}
		}

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

+20 −4

Original line number	Diff line number	Diff line
		@@ -1926,23 +1926,39 @@ public class SIMRecords extends IccRecords {
		@UnsupportedAppUsage
		@Override
		protected void log(String s) {
		if (mParentApp != null) {
		Rlog.d(LOG_TAG, "[SIMRecords-" + mParentApp.getPhoneId() + "] " + s);
		} else {
		Rlog.d(LOG_TAG, "[SIMRecords] " + s);
		}
		}

		@UnsupportedAppUsage
		@Override
		protected void loge(String s) {
		if (mParentApp != null) {
		Rlog.e(LOG_TAG, "[SIMRecords-" + mParentApp.getPhoneId() + "] " + s);
		} else {
		Rlog.e(LOG_TAG, "[SIMRecords] " + s);
		}
		}

		protected void logw(String s, Throwable tr) {
		if (mParentApp != null) {
		Rlog.w(LOG_TAG, "[SIMRecords-" + mParentApp.getPhoneId() + "] " + s, tr);
		} else {
		Rlog.w(LOG_TAG, "[SIMRecords] " + s, tr);
		}
		}

		@UnsupportedAppUsage
		protected void logv(String s) {
		if (mParentApp != null) {
		Rlog.v(LOG_TAG, "[SIMRecords-" + mParentApp.getPhoneId() + "] " + s);
		} else {
		Rlog.v(LOG_TAG, "[SIMRecords] " + s);
		}
		}

		/**
		* Return true if "Restriction of menu options for manual PLMN selection"