Merge branch 'eclair' into eclair-release (e12834ad) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+16 −2

Original line number	Diff line number	Diff line
		@@ -691,6 +691,20 @@ public final class ActivityThread {
		if (rd != null) {
		rd.performReceive(intent, resultCode, data, extras,
		ordered, sticky);
		} else {
		// The activity manager dispatched a broadcast to a registered
		// receiver in this process, but before it could be delivered the
		// receiver was unregistered. Acknowledge the broadcast on its
		// behalf so that the system's broadcast sequence can continue.
		if (DEBUG_BROADCAST) {
		Log.i(TAG, "Broadcast to unregistered receiver");
		}
		IActivityManager mgr = ActivityManagerNative.getDefault();
		try {
		mgr.finishReceiver(this, resultCode, data, extras, false);
		} catch (RemoteException e) {
		Log.w(TAG, "Couldn't finish broadcast to unregistered receiver");
		}
		}
		}
		}
		@@ -716,8 +730,8 @@ public final class ActivityThread {
		BroadcastReceiver receiver = mReceiver;
		if (DEBUG_BROADCAST) {
		int seq = mCurIntent.getIntExtra("seq", -1);
		Log.i(TAG, "Dispathing broadcast " + mCurIntent.getAction() + " seq=" + seq
		+ " to " + mReceiver);
		Log.i(TAG, "Dispatching broadcast " + mCurIntent.getAction()
		+ " seq=" + seq + " to " + mReceiver);
		}
		if (receiver == null) {
		return;

libs/surfaceflinger/LayerBuffer.cpp

+15 −9

Original line number	Diff line number	Diff line
		@@ -120,9 +120,7 @@ uint32_t LayerBuffer::doTransaction(uint32_t flags)
		source->onTransaction(flags);
		uint32_t res = LayerBase::doTransaction(flags);
		// we always want filtering for these surfaces
		if (!(mFlags & DisplayHardware::SLOW_CONFIG)) {
		mUseLinearFiltering = true;
		}
		mUseLinearFiltering = !(mFlags & DisplayHardware::SLOW_CONFIG);
		return res;
		}

		@@ -371,25 +369,33 @@ LayerBuffer::BufferSource::BufferSource(LayerBuffer& layer,
		// note that the size of this buffer doesn't really matter,
		// the final image will always be drawn with proper aspect ratio.

		int w = buffers.w;
		int h = buffers.h;
		int w = layer.mTransformedBounds.width();
		int h = layer.mTransformedBounds.height();
		if (buffers.w * h != buffers.h * w) {
		int t = w; w = h; h = t;
		}
		if (buffers.w * h == buffers.h * w) {
		// same pixel area, don't use filtering
		layer.mUseLinearFiltering = false;
		}

		mTempGraphicBuffer.clear();
		mTempGraphicBuffer = new GraphicBuffer(
		w, h, HAL_PIXEL_FORMAT_RGBX_8888,
		w, h, HAL_PIXEL_FORMAT_RGB_565,
		GraphicBuffer::USAGE_HW_TEXTURE \|
		GraphicBuffer::USAGE_HW_2D);

		if (mTempGraphicBuffer->initCheck() == NO_ERROR) {
		NativeBuffer& dst(mTempBuffer);
		dst.img.w = mTempGraphicBuffer->getStride();
		dst.img.h = mTempGraphicBuffer->getHeight();
		dst.img.h = h;
		dst.img.format = mTempGraphicBuffer->getPixelFormat();
		dst.img.handle = (native_handle_t *)mTempGraphicBuffer->handle;
		dst.img.base = 0;
		dst.crop.l = 0;
		dst.crop.t = 0;
		dst.crop.r = mTempGraphicBuffer->getWidth();
		dst.crop.b = mTempGraphicBuffer->getHeight();
		dst.crop.r = w;
		dst.crop.b = h;
		} else {
		mTempGraphicBuffer.clear();
		}

services/java/com/android/server/WindowManagerService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -6014,7 +6014,9 @@ public class WindowManagerService extends IWindowManager.Stub

		if (res != null && returnWhat == RETURN_PENDING_POINTER) {
		synchronized (mWindowMap) {
		if (mWallpaperTarget == win \|\| mSendingPointersToWallpaper) {
		if ((mWallpaperTarget == win &&
		win.mAttrs.type != WindowManager.LayoutParams.TYPE_KEYGUARD)
		\|\| mSendingPointersToWallpaper) {
		sendPointerToWallpaperLocked(win, res, res.getEventTime());
		}
		}

tests/LotsOfApps/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_MODULE_TAGS := tests
		LOCAL_MODULE_TAGS := optional

		LOCAL_SRC_FILES := $(call all-subdir-java-files)

wifi/java/android/net/wifi/WifiMonitor.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,8 @@ public class WifiMonitor {
		mWifiStateTracker.notifyDriverStopped();
		} else if (state.equals("STARTED")) {
		mWifiStateTracker.notifyDriverStarted();
		} else if (state.equals("HANGED")) {
		mWifiStateTracker.notifyDriverHung();
		}
		}