diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/CountryDetectorService.java | 5 | ||||
| -rwxr-xr-x | services/java/com/android/server/location/ComprehensiveCountryDetector.java | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/services/java/com/android/server/CountryDetectorService.java b/services/java/com/android/server/CountryDetectorService.java index ab61a3c..3112b50 100644 --- a/services/java/com/android/server/CountryDetectorService.java +++ b/services/java/com/android/server/CountryDetectorService.java @@ -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:"); diff --git a/services/java/com/android/server/location/ComprehensiveCountryDetector.java b/services/java/com/android/server/location/ComprehensiveCountryDetector.java index 2d6a148..1026a0d 100755 --- a/services/java/com/android/server/location/ComprehensiveCountryDetector.java +++ b/services/java/com/android/server/location/ComprehensiveCountryDetector.java @@ -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); |