Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the country detector logging

Browse Source 
Bug:6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
This commit is contained in:
Daniel Lehmann
2012-03-12 17:04:17 -07:00
parent f4ae6aabbc
commit 0e87370077
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/CountryDetectorService.java
View File

@@ -81,6 +81,9 @@ public class CountryDetectorService extends ICountryDetector.Stub implements Run
private final static String TAG = "CountryDetector"; 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 HashMap<IBinder, Receiver> mReceivers;
private final Context mContext; private final Context mContext;
private ComprehensiveCountryDetector mCountryDetector; private ComprehensiveCountryDetector mCountryDetector;
@@ -206,8 +209,10 @@ public class CountryDetectorService extends ICountryDetector.Stub implements Run
return mSystemReady; return mSystemReady;
} }
@SuppressWarnings("unused")
@Override @Override
protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) { protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {
if (!DEBUG) return;
try { try {
final Printer p = new PrintWriterPrinter(fout); final Printer p = new PrintWriterPrinter(fout);
p.println("CountryDetectorService state:"); p.println("CountryDetectorService state:");

4
services/java/com/android/server/location/ComprehensiveCountryDetector.java
View File

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