drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0e873700: Remove the country detector logging

Browse Source 
* commit '0e87370077b322b3a88c345a44c6bf3d56617071':
  Remove the country detector logging
This commit is contained in:
Daniel Lehmann
2012-03-12 18:24:41 -07:00
committed by Android Git Automerger
parent 442612a273 0e87370077
commit f0533f9462
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";
/** 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:");

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) {
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);