am f0533f94: am 0e873700: Remove the country detector logging (8f30d219) · Commits · e / os / android_frameworks_base

services/java/com/android/server/CountryDetectorService.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,9 @@ public class CountryDetectorService extends ICountryDetector.Stub implements Run

		private final static String TAG = "CountryDetector";

		/** Whether to dump the state of the country detector service to bugreports */
		private static final boolean DEBUG = false;

		private final HashMap<IBinder, Receiver> mReceivers;
		private final Context mContext;
		private ComprehensiveCountryDetector mCountryDetector;
		@@ -206,8 +209,10 @@ public class CountryDetectorService extends ICountryDetector.Stub implements Run
		return mSystemReady;
		}

		@SuppressWarnings("unused")
		@Override
		protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {
		if (!DEBUG) return;
		try {
		final Printer p = new PrintWriterPrinter(fout);
		p.println("CountryDetectorService state:");

+2 −2

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ public class ComprehensiveCountryDetector extends CountryDetectorBase {
		if (mDebugLogs.size() >= MAX_LENGTH_DEBUG_LOGS) {
		mDebugLogs.poll();
		}
		if (Log.isLoggable(TAG, Log.DEBUG)) {
		if (DEBUG) {
		Slog.d(TAG, country.toString());
		}
		mDebugLogs.add(country);
		@@ -394,7 +394,7 @@ public class ComprehensiveCountryDetector extends CountryDetectorBase {
		private void notifyIfCountryChanged(final Country country, final Country detectedCountry) {
		if (detectedCountry != null && mListener != null
		&& (country == null \|\| !country.equals(detectedCountry))) {
		if (Log.isLoggable(TAG, Log.DEBUG)) {
		if (DEBUG) {
		Slog.d(TAG, "" + country + " --> " + detectedCountry);
		}
		notifyListener(detectedCountry);