Merge "Reduce logging." into gingerbread (bdf1706a) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/util/HierarchicalStateMachine.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -1094,8 +1094,10 @@ public class HierarchicalStateMachine {
		* @param msg that couldn't be handled.
		*/
		protected void unhandledMessage(Message msg) {
		if (false) {
		Log.e(TAG, mName + " - unhandledMessage: msg.what=" + msg.what);
		}
		}

		/**
		* Called for any message that is received after

libs/utils/StreamingZipInflater.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -710,7 +710,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);

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -392,8 +392,6 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks
		}

		public void updateNotification(IBinder key, StatusBarNotification notification) {
		Slog.d(TAG, "updateNotification key=" + key + " notification=" + notification);

		NotificationData oldList;
		int oldIndex = mOngoing.findEntry(key);
		if (oldIndex >= 0) {
		@@ -628,27 +626,27 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks

		if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {
		if ((state & StatusBarManager.DISABLE_EXPAND) != 0) {
		Slog.d(TAG, "DISABLE_EXPAND: yes");
		if (SPEW) Slog.d(TAG, "DISABLE_EXPAND: yes");
		animateCollapse();
		}
		}
		if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
		if ((state & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
		Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: yes");
		if (SPEW) Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: yes");
		if (mTicking) {
		mTicker.halt();
		} else {
		setNotificationIconVisibility(false, com.android.internal.R.anim.fade_out);
		}
		} else {
		Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: no");
		if (SPEW) Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: no");
		if (!mExpandedVisible) {
		setNotificationIconVisibility(true, com.android.internal.R.anim.fade_in);
		}
		}
		} else if ((diff & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
		if (mTicking && (state & StatusBarManager.DISABLE_NOTIFICATION_TICKER) != 0) {
		Slog.d(TAG, "DISABLE_NOTIFICATION_TICKER: yes");
		if (SPEW) Slog.d(TAG, "DISABLE_NOTIFICATION_TICKER: yes");
		mTicker.halt();
		}
		}

policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -93,8 +93,8 @@ import android.view.WindowManagerPolicy;
		*/
		public class KeyguardViewMediator implements KeyguardViewCallback,
		KeyguardUpdateMonitor.SimStateCallback {
		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";

		@@ -605,7 +605,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