diff options
Diffstat (limited to 'services/java')
8 files changed, 38 insertions, 22 deletions
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index aa87f29..a7e02a5 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 0a5b72b..e8c1613 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -684,9 +684,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 c7735d9..d324c2b 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 4177432..e5dfb18 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(); @@ -154,7 +154,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 7e23422..3370279 100644 --- a/services/java/com/android/server/TelephonyRegistry.java +++ b/services/java/com/android/server/TelephonyRegistry.java @@ -254,6 +254,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { if (!checkNotifyPermission("notifyServiceState()")){ return; } + Slog.i(TAG, "notifyServiceState: " + state); synchronized (mRecords) { mServiceState = state; for (int i = mRecords.size() - 1; i >= 0; i--) { @@ -295,6 +296,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { if (!checkNotifyPermission("notifyMessageWaitingChanged()")) { return; } + Slog.i(TAG, "notifyMessageWaitingChanged: " + mwi); synchronized (mRecords) { mMessageWaiting = mwi; for (int i = mRecords.size() - 1; i >= 0; i--) { @@ -314,6 +316,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { if (!checkNotifyPermission("notifyCallForwardingChanged()")) { return; } + Slog.i(TAG, "notifyCallForwardingChanged: " + cfi); synchronized (mRecords) { mCallForwarding = cfi; for (int i = mRecords.size() - 1; i >= 0; i--) { @@ -354,6 +357,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) { mDataConnectionState = state; mDataConnectionPossible = isDataConnectivityPossible; diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index a63b3d8..c1e9965 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -1656,7 +1656,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; @@ -1671,7 +1673,9 @@ public class WifiService extends IWifiManager.Stub { sendEnableNetworksMessage(); } } else if (action.equals(Intent.ACTION_SCREEN_OFF)) { - Slog.d(TAG, "ACTION_SCREEN_OFF"); + if (DBG) { + Slog.d(TAG, "ACTION_SCREEN_OFF"); + } mScreenOff = true; mWifiStateTracker.enableRssiPolling(false); /* @@ -1688,21 +1692,28 @@ public class WifiService extends IWifiManager.Stub { // 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); } } /* we can return now -- there's nothing to do until we get the idle intent back */ return; } 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(); } else if (action.equals(Intent.ACTION_BATTERY_CHANGED)) { @@ -1714,11 +1725,15 @@ public class WifiService extends IWifiManager.Stub { * the already-set timer. */ int pluggedType = intent.getIntExtra("plugged", 0); - Slog.d(TAG, "ACTION_BATTERY_CHANGED pluggedType: " + pluggedType); + 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; return; diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java index 1bc5e4b..a73a4ce 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -120,7 +120,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; @@ -457,7 +456,6 @@ public class Tethering extends INetworkManagementEventObserver.Stub { mUsbMassStorageOff = true; updateUsbStatus(); } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) { - Log.d(TAG, "Tethering got CONNECTIVITY_ACTION"); mTetherMasterSM.sendMessage(TetherMasterSM.CMD_UPSTREAM_CHANGED); } else if (action.equals(Intent.ACTION_BOOT_COMPLETED)) { mBooted = true; 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(); |