resolved conflicts for merge of 368fdba4 to master (385a753d) · 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

+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;
		}

+0 −1

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

+8 −6

Original line number	Diff line number	Diff line
		@@ -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,6 +122,7 @@ public abstract class StatusBarService extends Service implements CommandQueue.C
		// TODO lp.windowAnimations = R.style.Animation_StatusBar;
		WindowManagerImpl.getDefault().addView(sb, lp);

		if (SPEW) {
		Slog.d(TAG, "Added status bar view: gravity=0x" + Integer.toHexString(lp.gravity)
		+ " icons=" + iconList.size()
		+ " lights=" + (switches[0]?"on":"off")
		@@ -128,4 +130,4 @@ public abstract class StatusBarService extends Service implements CommandQueue.C
		);
		}
		}

		}

+3 −5

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