diff options
15 files changed, 78 insertions, 67 deletions
diff --git a/core/java/com/android/internal/util/HierarchicalStateMachine.java b/core/java/com/android/internal/util/HierarchicalStateMachine.java index aaaa194..7920b72 100644 --- a/core/java/com/android/internal/util/HierarchicalStateMachine.java +++ b/core/java/com/android/internal/util/HierarchicalStateMachine.java @@ -1094,7 +1094,9 @@ public class HierarchicalStateMachine { * @param msg that couldn't be handled. */ protected void unhandledMessage(Message msg) { - Log.e(TAG, mName + " - unhandledMessage: msg.what=" + msg.what); + if (false) { + Log.e(TAG, mName + " - unhandledMessage: msg.what=" + msg.what); + } } /** diff --git a/libs/utils/StreamingZipInflater.cpp b/libs/utils/StreamingZipInflater.cpp index 7ebde78..1f62ac5 100644 --- a/libs/utils/StreamingZipInflater.cpp +++ b/libs/utils/StreamingZipInflater.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#define LOG_NDEBUG 1 #define LOG_TAG "szipinf" #include <utils/Log.h> @@ -157,7 +158,7 @@ ssize_t StreamingZipInflater::read(void* outBuf, size_t count) { */ int result = Z_OK; if (mStreamNeedsInit) { - LOGI("Initializing zlib to inflate"); + LOGD("Initializing zlib to inflate"); result = inflateInit2(&mInflateState, -MAX_WBITS); mStreamNeedsInit = false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java index e0019b5..fb74e70 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java @@ -699,7 +699,6 @@ public class StatusBarPolicy { NetworkInfo info = (NetworkInfo)(intent.getParcelableExtra( ConnectivityManager.EXTRA_NETWORK_INFO)); int connectionStatus = intent.getIntExtra(ConnectivityManager.EXTRA_INET_CONDITION, 0); - Slog.d(TAG, "got CONNECTIVITY_ACTION - info=" + info + ", status = " + connectionStatus); int inetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java index 5594a47..a7e5d73 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java @@ -44,6 +44,7 @@ import com.android.systemui.R; public abstract class StatusBarService extends Service implements CommandQueue.Callbacks { static final String TAG = "StatusBarService"; + private static final boolean SPEW = false; protected CommandQueue mCommandQueue; protected IStatusBarService mBarService; @@ -121,11 +122,12 @@ public abstract class StatusBarService extends Service implements CommandQueue.C // TODO lp.windowAnimations = R.style.Animation_StatusBar; WindowManagerImpl.getDefault().addView(sb, lp); - Slog.d(TAG, "Added status bar view: gravity=0x" + Integer.toHexString(lp.gravity) - + " icons=" + iconList.size() - + " lights=" + (switches[0]?"on":"off") - + " menu=" + (switches[1]?"visible":"invisible") - ); + if (SPEW) { + Slog.d(TAG, "Added status bar view: gravity=0x" + Integer.toHexString(lp.gravity) + + " icons=" + iconList.size() + + " lights=" + (switches[0]?"on":"off") + + " menu=" + (switches[1]?"visible":"invisible") + ); + } } } - diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index d19f318..165107c 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -97,8 +97,8 @@ import android.view.WindowManagerPolicy; public class KeyguardViewMediator implements KeyguardViewCallback, KeyguardUpdateMonitor.SimStateCallback { private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000; - private final static boolean DEBUG = false && Config.LOGD; - private final static boolean DBG_WAKE = DEBUG || true; + private final static boolean DEBUG = false; + private final static boolean DBG_WAKE = false; private final static String TAG = "KeyguardViewMediator"; @@ -642,7 +642,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback, * @see #onWakeKeyWhenKeyguardShowingTq(int) */ private void wakeWhenReadyLocked(int keyCode) { - if (DBG_WAKE) Log.d(TAG, "wakeWhenReadyLocked(" + keyCode + ")"); + if (true || DBG_WAKE) Log.d(TAG, "wakeWhenReadyLocked(" + keyCode + ")"); /** * acquire the handoff lock that will keep the cpu running. this will @@ -1169,5 +1169,3 @@ public class KeyguardViewMediator implements KeyguardViewCallback, } } } - - diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index 50b3abe..90ebf3f 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -664,11 +664,11 @@ class BackupManagerService extends IBackupManager.Stub { // backup. RandomAccessFile in = null; try { - Slog.i(TAG, "Found stale backup journal, scheduling:"); + Slog.i(TAG, "Found stale backup journal, scheduling"); in = new RandomAccessFile(f, "r"); while (true) { String packageName = in.readUTF(); - Slog.i(TAG, " + " + packageName); + Slog.i(TAG, " " + packageName); dataChangedImpl(packageName); } } catch (EOFException e) { diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 15eaa9e..8066fa7 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -700,9 +700,6 @@ public class NotificationManagerService extends INotificationManager.Stub public void enqueueNotificationInternal(String pkg, int callingUid, int callingPid, String tag, int id, Notification notification, int[] idOut) { - Slog.d(TAG, "enqueueNotificationWithTag: calling uid=" + callingUid - + ", pid=" + callingPid); - checkIncomingCall(pkg); // Limit the number of notifications that any given package except the android diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 666bb26..c50a01e 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -2500,7 +2500,9 @@ class PackageManagerService extends IPackageManager.Stub { return; } - Log.d(TAG, "Scanning app dir " + dir); + if (false) { + Log.d(TAG, "Scanning app dir " + dir); + } int i; for (i=0; i<files.length; i++) { @@ -2866,10 +2868,8 @@ class PackageManagerService extends IPackageManager.Stub { TAG, "Scanning package " + pkg.packageName); if (mPackages.containsKey(pkg.packageName) || mSharedLibraries.containsKey(pkg.packageName)) { - Slog.w(TAG, "*************************************************"); Slog.w(TAG, "Application package " + pkg.packageName + " already installed. Skipping duplicate."); - Slog.w(TAG, "*************************************************"); mLastScanError = PackageManager.INSTALL_FAILED_DUPLICATE_PACKAGE; return null; } diff --git a/services/java/com/android/server/StatusBarManagerService.java b/services/java/com/android/server/StatusBarManagerService.java index 66e0214..1ffc0ee 100644 --- a/services/java/com/android/server/StatusBarManagerService.java +++ b/services/java/com/android/server/StatusBarManagerService.java @@ -54,7 +54,7 @@ import java.util.Map; public class StatusBarManagerService extends IStatusBarService.Stub { static final String TAG = "StatusBarManagerService"; - static final boolean SPEW = true; + static final boolean SPEW = false; final Context mContext; Handler mHandler = new Handler(); @@ -161,7 +161,6 @@ public class StatusBarManagerService extends IStatusBarService.Stub synchronized (mDisableRecords) { manageDisableListLocked(what, token, pkg); final int net = gatherDisableActionsLocked(); - Slog.d(TAG, "disable... net=0x" + Integer.toHexString(net)); if (net != mDisabled) { mDisabled = net; mHandler.post(new Runnable() { diff --git a/services/java/com/android/server/TelephonyRegistry.java b/services/java/com/android/server/TelephonyRegistry.java index 2b4845b..b3242d7 100644 --- a/services/java/com/android/server/TelephonyRegistry.java +++ b/services/java/com/android/server/TelephonyRegistry.java @@ -260,6 +260,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { if (!checkNotifyPermission("notifyServiceState()")){ return; } + Slog.i(TAG, "notifyServiceState: " + state); synchronized (mRecords) { mServiceState = state; for (Record r : mRecords) { @@ -363,6 +364,9 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { if (!checkNotifyPermission("notifyDataConnection()" )) { return; } + Slog.i(TAG, "notifyDataConnection: state=" + state + " isDataConnectivityPossible=" + + isDataConnectivityPossible + " reason=" + reason + + " interfaceName=" + interfaceName + " networkType=" + networkType); synchronized (mRecords) { boolean modified = false; if (state == TelephonyManager.DATA_CONNECTED) { diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 9cd8fbf..4f75366 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -889,7 +889,9 @@ public class WifiService extends IWifiManager.Stub { Settings.System.getInt(mContext.getContentResolver(), Settings.System.STAY_ON_WHILE_PLUGGED_IN, 0); if (action.equals(Intent.ACTION_SCREEN_ON)) { - Slog.d(TAG, "ACTION_SCREEN_ON"); + if (DBG) { + Slog.d(TAG, "ACTION_SCREEN_ON"); + } mAlarmManager.cancel(mIdleIntent); mDeviceIdle = false; mScreenOff = false; @@ -899,7 +901,9 @@ public class WifiService extends IWifiManager.Stub { mWifiStateMachine.enableRssiPolling(true); updateWifiState(); } else if (action.equals(Intent.ACTION_SCREEN_OFF)) { - Slog.d(TAG, "ACTION_SCREEN_OFF"); + if (DBG) { + Slog.d(TAG, "ACTION_SCREEN_OFF"); + } mScreenOff = true; mWifiStateMachine.enableRssiPolling(false); /* @@ -916,19 +920,26 @@ public class WifiService extends IWifiManager.Stub { // but not as long as we would if connected (below) // TODO - fix the race conditions and switch back to the immediate turn-off long triggerTime = System.currentTimeMillis() + (2*60*1000); // 2 min - Slog.d(TAG, "setting ACTION_DEVICE_IDLE timer for 120,000 ms"); + if (DBG) { + Slog.d(TAG, "setting ACTION_DEVICE_IDLE timer for 120,000 ms"); + } mAlarmManager.set(AlarmManager.RTC_WAKEUP, triggerTime, mIdleIntent); // // do not keep Wifi awake when screen is off if Wifi is not associated // mDeviceIdle = true; // updateWifiState(); } else { long triggerTime = System.currentTimeMillis() + idleMillis; - Slog.d(TAG, "setting ACTION_DEVICE_IDLE timer for " + idleMillis + "ms"); + if (DBG) { + Slog.d(TAG, "setting ACTION_DEVICE_IDLE timer for " + idleMillis + + "ms"); + } mAlarmManager.set(AlarmManager.RTC_WAKEUP, triggerTime, mIdleIntent); } } } else if (action.equals(ACTION_DEVICE_IDLE)) { - Slog.d(TAG, "got ACTION_DEVICE_IDLE"); + if (DBG) { + Slog.d(TAG, "got ACTION_DEVICE_IDLE"); + } mDeviceIdle = true; reportStartWorkSource(); updateWifiState(); @@ -941,10 +952,15 @@ public class WifiService extends IWifiManager.Stub { * the already-set timer. */ int pluggedType = intent.getIntExtra("plugged", 0); + if (DBG) { + Slog.d(TAG, "ACTION_BATTERY_CHANGED pluggedType: " + pluggedType); + } if (mScreenOff && shouldWifiStayAwake(stayAwakeConditions, mPluggedType) && !shouldWifiStayAwake(stayAwakeConditions, pluggedType)) { long triggerTime = System.currentTimeMillis() + idleMillis; - Slog.d(TAG, "setting ACTION_DEVICE_IDLE timer for " + idleMillis + "ms"); + if (DBG) { + Slog.d(TAG, "setting ACTION_DEVICE_IDLE timer for " + idleMillis + "ms"); + } mAlarmManager.set(AlarmManager.RTC_WAKEUP, triggerTime, mIdleIntent); } mPluggedType = pluggedType; diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java index 0623f5b..d469d67 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -136,7 +136,6 @@ public class Tethering extends INetworkManagementEventObserver.Stub { static final long USB_DISCONNECT_DELAY = 1000; public Tethering(Context context, Looper looper) { - Log.d(TAG, "Tethering starting"); mContext = context; mLooper = looper; diff --git a/services/java/com/android/server/location/GpsXtraDownloader.java b/services/java/com/android/server/location/GpsXtraDownloader.java index bc96980..813d255 100644 --- a/services/java/com/android/server/location/GpsXtraDownloader.java +++ b/services/java/com/android/server/location/GpsXtraDownloader.java @@ -44,6 +44,7 @@ import java.util.Random; public class GpsXtraDownloader { private static final String TAG = "GpsXtraDownloader"; + static final boolean DEBUG = false; private Context mContext; private String[] mXtraServers; @@ -107,7 +108,7 @@ public class GpsXtraDownloader { protected static byte[] doDownload(String url, boolean isProxySet, String proxyHost, int proxyPort) { - if (Config.LOGD) Log.d(TAG, "Downloading XTRA data from " + url); + if (DEBUG) Log.d(TAG, "Downloading XTRA data from " + url); AndroidHttpClient client = null; try { @@ -130,7 +131,7 @@ public class GpsXtraDownloader { HttpResponse response = client.execute(req); StatusLine status = response.getStatusLine(); if (status.getStatusCode() != 200) { // HTTP 200 is success. - if (Config.LOGD) Log.d(TAG, "HTTP error: " + status.getReasonPhrase()); + if (DEBUG) Log.d(TAG, "HTTP error: " + status.getReasonPhrase()); return null; } @@ -159,7 +160,7 @@ public class GpsXtraDownloader { } return body; } catch (Exception e) { - if (Config.LOGD) Log.d(TAG, "error " + e); + if (DEBUG) Log.d(TAG, "error " + e); } finally { if (client != null) { client.close(); diff --git a/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java b/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java index 8471efa..ce6875f 100644 --- a/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java +++ b/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java @@ -38,7 +38,7 @@ import android.util.Log; */ public class CallerInfoAsyncQuery { - private static final boolean DBG = (SystemProperties.getInt("ro.debuggable", 0) == 1); + private static final boolean DBG = false; private static final String LOG_TAG = "CallerInfoAsyncQuery"; private static final int EVENT_NEW_QUERY = 1; @@ -129,13 +129,13 @@ public class CallerInfoAsyncQuery { // However, if there is any code that this Handler calls (such as in // super.handleMessage) that DOES place unexpected messages on the // queue, then we need pass these messages on. - if (DBG) log("Unexpected command (CookieWrapper is null): " + msg.what + + if (DBG) Log.d(LOG_TAG, "Unexpected command (CookieWrapper is null): " + msg.what + " ignored by CallerInfoWorkerHandler, passing onto parent."); super.handleMessage(msg); } else { - if (DBG) log("Processing event: " + cw.event + " token (arg1): " + msg.arg1 + + if (DBG) Log.d(LOG_TAG, "Processing event: " + cw.event + " token (arg1): " + msg.arg1 + " command: " + msg.what + " query URI: " + sanitizeUriToString(args.uri)); switch (cw.event) { @@ -191,7 +191,7 @@ public class CallerInfoAsyncQuery { */ @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - if (DBG) log("##### onQueryComplete() ##### query complete for token: " + token); + if (DBG) Log.d(LOG_TAG, "##### onQueryComplete() ##### query complete for token: " + token); //get the cookie and notify the listener. CookieWrapper cw = (CookieWrapper) cookie; @@ -200,7 +200,7 @@ public class CallerInfoAsyncQuery { // from within this code. // However, if there is any code that calls this method, we should // check the parameters to make sure they're viable. - if (DBG) log("Cookie is null, ignoring onQueryComplete() request."); + if (DBG) Log.d(LOG_TAG, "Cookie is null, ignoring onQueryComplete() request."); return; } @@ -229,7 +229,7 @@ public class CallerInfoAsyncQuery { mCallerInfo = new CallerInfo().markAsVoiceMail(); } else { mCallerInfo = CallerInfo.getCallerInfo(mQueryContext, mQueryUri, cursor); - if (DBG) log("==> Got mCallerInfo: " + mCallerInfo); + if (DBG) Log.d(LOG_TAG, "==> Got mCallerInfo: " + mCallerInfo); // Use the number entered by the user for display. if (!TextUtils.isEmpty(cw.number)) { @@ -241,7 +241,7 @@ public class CallerInfoAsyncQuery { } } - if (DBG) log("constructing CallerInfo object for token: " + token); + if (DBG) Log.d(LOG_TAG, "constructing CallerInfo object for token: " + token); //notify that we can clean up the queue after this. CookieWrapper endMarker = new CookieWrapper(); @@ -251,7 +251,7 @@ public class CallerInfoAsyncQuery { //notify the listener that the query is complete. if (cw.listener != null) { - if (DBG) log("notifying listener: " + cw.listener.getClass().toString() + + if (DBG) Log.d(LOG_TAG, "notifying listener: " + cw.listener.getClass().toString() + " for token: " + token + mCallerInfo); cw.listener.onQueryComplete(token, cw.cookie, mCallerInfo); } @@ -274,7 +274,7 @@ public class CallerInfoAsyncQuery { CallerInfoAsyncQuery c = new CallerInfoAsyncQuery(); c.allocate(context, contactRef); - if (DBG) log("starting query for URI: " + contactRef + " handler: " + c.toString()); + if (DBG) Log.d(LOG_TAG, "starting query for URI: " + contactRef + " handler: " + c.toString()); //create cookieWrapper, start query CookieWrapper cw = new CookieWrapper(); @@ -301,9 +301,9 @@ public class CallerInfoAsyncQuery { public static CallerInfoAsyncQuery startQuery(int token, Context context, String number, OnQueryCompleteListener listener, Object cookie) { if (DBG) { - log("##### CallerInfoAsyncQuery startQuery()... #####"); - log("- number: " + /*number*/ "xxxxxxx"); - log("- cookie: " + cookie); + Log.d(LOG_TAG, "##### CallerInfoAsyncQuery startQuery()... #####"); + Log.d(LOG_TAG, "- number: " + /*number*/ "xxxxxxx"); + Log.d(LOG_TAG, "- cookie: " + cookie); } // Construct the URI object and query params, and start the query. @@ -314,7 +314,7 @@ public class CallerInfoAsyncQuery { if (PhoneNumberUtils.isUriNumber(number)) { // "number" is really a SIP address. - if (DBG) log(" - Treating number as a SIP address: " + /*number*/ "xxxxxxx"); + if (DBG) Log.d(LOG_TAG, " - Treating number as a SIP address: " + /*number*/ "xxxxxxx"); // We look up SIP addresses directly in the Data table: contactRef = Data.CONTENT_URI; @@ -346,11 +346,11 @@ public class CallerInfoAsyncQuery { } if (DBG) { - log("==> contactRef: " + sanitizeUriToString(contactRef)); - log("==> selection: " + selection); + Log.d(LOG_TAG, "==> contactRef: " + sanitizeUriToString(contactRef)); + Log.d(LOG_TAG, "==> selection: " + selection); if (selectionArgs != null) { for (int i = 0; i < selectionArgs.length; i++) { - log("==> selectionArgs[" + i + "]: " + selectionArgs[i]); + Log.d(LOG_TAG, "==> selectionArgs[" + i + "]: " + selectionArgs[i]); } } } @@ -388,7 +388,7 @@ public class CallerInfoAsyncQuery { */ public void addQueryListener(int token, OnQueryCompleteListener listener, Object cookie) { - if (DBG) log("adding listener to query: " + sanitizeUriToString(mHandler.mQueryUri) + + if (DBG) Log.d(LOG_TAG, "adding listener to query: " + sanitizeUriToString(mHandler.mQueryUri) + " handler: " + mHandler.toString()); //create cookieWrapper, add query request to end of queue. @@ -436,11 +436,4 @@ public class CallerInfoAsyncQuery { return ""; } } - - /** - * static logging method - */ - private static void log(String msg) { - Log.d(LOG_TAG, msg); - } } diff --git a/voip/java/com/android/server/sip/SipService.java b/voip/java/com/android/server/sip/SipService.java index 1df08c0..a6f0d88 100644 --- a/voip/java/com/android/server/sip/SipService.java +++ b/voip/java/com/android/server/sip/SipService.java @@ -68,7 +68,7 @@ import javax.sip.SipException; public final class SipService extends ISipService.Stub { static final String TAG = "SipService"; static final boolean DEBUGV = false; - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private static final boolean DEBUG_TIMER = DEBUG && false; private static final int EXPIRY_TIME = 3600; private static final int SHORT_EXPIRY_TIME = 10; @@ -104,7 +104,7 @@ public final class SipService extends ISipService.Stub { if (SipManager.isApiSupported(context)) { ServiceManager.addService("sip", new SipService(context)); context.sendBroadcast(new Intent(SipManager.ACTION_SIP_SERVICE_UP)); - Log.i(TAG, "SIP service started"); + if (DEBUG) Log.i(TAG, "SIP service started"); } } @@ -222,7 +222,7 @@ public final class SipService extends ISipService.Stub { SipSessionGroupExt group = mSipGroups.get(localProfileUri); if (group == null) return; if (!isCallerCreatorOrRadio(group)) { - Log.d(TAG, "only creator or radio can close this profile"); + Log.w(TAG, "only creator or radio can close this profile"); return; } @@ -244,7 +244,7 @@ public final class SipService extends ISipService.Stub { if (isCallerCreatorOrRadio(group)) { return group.isOpened(); } else { - Log.i(TAG, "only creator or radio can query on the profile"); + Log.w(TAG, "only creator or radio can query on the profile"); return false; } } @@ -257,7 +257,7 @@ public final class SipService extends ISipService.Stub { if (isCallerCreatorOrRadio(group)) { return group.isRegistered(); } else { - Log.i(TAG, "only creator or radio can query on the profile"); + Log.w(TAG, "only creator or radio can query on the profile"); return false; } } @@ -271,7 +271,7 @@ public final class SipService extends ISipService.Stub { if (isCallerCreator(group)) { group.setListener(listener); } else { - Log.i(TAG, "only creator can set listener on the profile"); + Log.w(TAG, "only creator can set listener on the profile"); } } @@ -285,7 +285,7 @@ public final class SipService extends ISipService.Stub { SipSessionGroupExt group = createGroup(localProfile); return group.createSession(listener); } catch (SipException e) { - Log.w(TAG, "createSession()", e); + if (DEBUG) Log.d(TAG, "createSession()", e); return null; } } @@ -303,7 +303,7 @@ public final class SipService extends ISipService.Stub { s.connect(InetAddress.getByName("192.168.1.1"), 80); return s.getLocalAddress().getHostAddress(); } catch (IOException e) { - Log.w(TAG, "determineLocalIp()", e); + if (DEBUG) Log.d(TAG, "determineLocalIp()", e); // dont do anything; there should be a connectivity change going return null; } @@ -467,7 +467,7 @@ public final class SipService extends ISipService.Stub { return createSipSessionGroup(null, localProfile, password); } else { // recursive - Log.wtf(TAG, "impossible!"); + Log.wtf(TAG, "impossible! recursive!"); throw new RuntimeException("createSipSessionGroup"); } } |