Merge "Improve some logs for EmergencyNumberTracker" (a8ba60d5) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+28 −5

Original line number	Original line	Diff line number	Diff line
	@@ -141,6 +141,8 @@ public class EmergencyNumberTracker extends Handler {
	mEmergencyNumberPrefix = b.getStringArray(		mEmergencyNumberPrefix = b.getStringArray(
	CarrierConfigManager.KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY);		CarrierConfigManager.KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY);
	}		}
			} else {
			loge("CarrierConfigManager is null.");
	}		}

	// Receive Carrier Config Changes		// Receive Carrier Config Changes
	@@ -150,7 +152,10 @@ public class EmergencyNumberTracker extends Handler {
	filter.addAction(TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED);		filter.addAction(TelephonyManager.ACTION_NETWORK_COUNTRY_CHANGED);

	mPhone.getContext().registerReceiver(mIntentReceiver, filter);		mPhone.getContext().registerReceiver(mIntentReceiver, filter);
			} else {
			loge("mPhone is null.");
	}		}

	initializeDatabaseEmergencyNumberList();		initializeDatabaseEmergencyNumberList();
	mCi.registerForEmergencyNumberList(this, EVENT_UNSOL_EMERGENCY_NUMBER_LIST, null);		mCi.registerForEmergencyNumberList(this, EVENT_UNSOL_EMERGENCY_NUMBER_LIST, null);
	}		}
	@@ -242,6 +247,9 @@ public class EmergencyNumberTracker extends Handler {
	return lt.getCurrentCountry();		return lt.getCurrentCountry();
	}		}
	}		}
			} else {
			loge("getInitialCountryIso mPhone is null.");

	}		}
	return "";		return "";
	}		}
	@@ -826,34 +834,49 @@ public class EmergencyNumberTracker extends Handler {
	*/		*/
	public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
	final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ");		final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ");
			ipw.println(" Hal Version:" + mPhone.getHalVersion());
			ipw.println(" ========================================= ");

	ipw.println("mEmergencyNumberListDatabaseLocalLog:");		ipw.println("mEmergencyNumberListDatabaseLocalLog:");
	ipw.increaseIndent();		ipw.increaseIndent();
	mEmergencyNumberListDatabaseLocalLog.dump(fd, pw, args);		mEmergencyNumberListDatabaseLocalLog.dump(fd, pw, args);
	ipw.decreaseIndent();		ipw.decreaseIndent();
	ipw.println(" - - - - - - - -");		ipw.println(" ========================================= ");

	ipw.println("mEmergencyNumberListRadioLocalLog:");		ipw.println("mEmergencyNumberListRadioLocalLog:");
	ipw.increaseIndent();		ipw.increaseIndent();
	mEmergencyNumberListRadioLocalLog.dump(fd, pw, args);		mEmergencyNumberListRadioLocalLog.dump(fd, pw, args);
	ipw.decreaseIndent();		ipw.decreaseIndent();
	ipw.println(" - - - - - - - -");		ipw.println(" ========================================= ");

	ipw.println("mEmergencyNumberListPrefixLocalLog:");		ipw.println("mEmergencyNumberListPrefixLocalLog:");
	ipw.increaseIndent();		ipw.increaseIndent();
	mEmergencyNumberListPrefixLocalLog.dump(fd, pw, args);		mEmergencyNumberListPrefixLocalLog.dump(fd, pw, args);
	ipw.decreaseIndent();		ipw.decreaseIndent();
	ipw.println(" - - - - - - - -");		ipw.println(" ========================================= ");

	ipw.println("mEmergencyNumberListTestModeLocalLog:");		ipw.println("mEmergencyNumberListTestModeLocalLog:");
	ipw.increaseIndent();		ipw.increaseIndent();
	mEmergencyNumberListTestModeLocalLog.dump(fd, pw, args);		mEmergencyNumberListTestModeLocalLog.dump(fd, pw, args);
	ipw.decreaseIndent();		ipw.decreaseIndent();
	ipw.println(" - - - - - - - -");		ipw.println(" ========================================= ");

	ipw.println("mEmergencyNumberListLocalLog:");		ipw.println("mEmergencyNumberListLocalLog (valid >= 1.4 HAL):");
	ipw.increaseIndent();		ipw.increaseIndent();
	mEmergencyNumberListLocalLog.dump(fd, pw, args);		mEmergencyNumberListLocalLog.dump(fd, pw, args);
	ipw.decreaseIndent();		ipw.decreaseIndent();
			ipw.println(" ========================================= ");

			int slotId = SubscriptionController.getInstance().getSlotIndex(mPhone.getSubId());
			String ecclist = (slotId <= 0) ? "ril.ecclist" : ("ril.ecclist" + slotId);
			ipw.println(" ril.ecclist: " + SystemProperties.get(ecclist, ""));
			ipw.println(" ========================================= ");

			ipw.println("Emergency Number List for Phone" + "(" + mPhone.getPhoneId() + ")");
			ipw.increaseIndent();
			ipw.println(getEmergencyNumberList());
			ipw.decreaseIndent();
			ipw.println(" ========================================= ");

	ipw.flush();		ipw.flush();
	}		}