Merge change 23568 into eclair (6db4303d) · Commits · e / os / android_frameworks_base

libs/ui/EventHub.cpp

+12 −5

Original line number	Diff line number	Diff line
		@@ -781,12 +781,21 @@ int EventHub::close_device(const char *deviceName)
		if(strcmp(mDevices[i]->path.string(), deviceName) == 0) {
		//LOGD("remove device %d: %s\n", i, deviceName);
		device_t* device = mDevices[i];
		int count = mFDCount - i - 1;

		LOGI("Removed device: path=%s name=%s id=0x%x (of 0x%x) index=%d fd=%d classes=0x%x\n",
		device->path.string(), device->name.string(), device->id,
		mNumDevicesById, mFDCount, mFDs[i].fd, device->classes);

		// Clear this device's entry.
		int index = (device->id&ID_MASK);
		mDevicesById[index].device = NULL;

		// Close the file descriptor and compact the fd array.
		close(mFDs[i].fd);
		int count = mFDCount - i - 1;
		memmove(mDevices + i, mDevices + i + 1, sizeof(mDevices[0]) * count);
		memmove(mFDs + i, mFDs + i + 1, sizeof(mFDs[0]) * count);
		mFDCount--;

		#ifdef EV_SW
		for (int j=0; j<EV_SW; j++) {
		@@ -799,8 +808,6 @@ int EventHub::close_device(const char *deviceName)
		device->next = mClosingDevices;
		mClosingDevices = device;

		mFDCount--;

		uint32_t publicID;
		if (device->id == mFirstKeyboardId) {
		LOGW("built-in keyboard device %s (id=%d) is closing! the apps will not like this",
		@@ -817,7 +824,7 @@ int EventHub::close_device(const char *deviceName)
		return 0;
		}
		}
		LOGE("remote device: %s not found\n", deviceName);
		LOGE("remove device: %s not found\n", deviceName);
		return -1;
		}

		@@ -832,7 +839,7 @@ int EventHub::read_notify(int nfd)
		int event_pos = 0;
		struct inotify_event *event;

		LOGD("EventHub::read_notify nfd: %d\n", nfd);
		LOGV("EventHub::read_notify nfd: %d\n", nfd);
		res = read(nfd, event_buf, sizeof(event_buf));
		if(res < (int)sizeof(*event)) {
		if(errno == EINTR)

services/java/com/android/server/KeyInputQueue.java

+59 −33

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ public abstract class KeyInputQueue {
		private static final String EXCLUDED_DEVICES_PATH = "etc/excluded-input-devices.xml";

		final SparseArray<InputDevice> mDevices = new SparseArray<InputDevice>();
		final SparseArray<InputDevice> mIgnoredDevices = new SparseArray<InputDevice>();
		final ArrayList<VirtualKey> mVirtualKeys = new ArrayList<VirtualKey>();
		final HapticFeedbackCallback mHapticFeedbackCallback;

		@@ -391,26 +392,50 @@ public abstract class KeyInputQueue {
		if (ev.type == RawInputEvent.EV_DEVICE_ADDED) {
		synchronized (mFirst) {
		di = newInputDevice(ev.deviceId);
		if (di.classes != 0) {
		// If this device is some kind of input class,
		// we care about it.
		mDevices.put(ev.deviceId, di);
		if ((di.classes & RawInputEvent.CLASS_TOUCHSCREEN) != 0) {
		readVirtualKeys(di.name);
		}
		// The configuration may have changed because
		// of this device.
		configChanged = true;
		} else {
		// We won't do anything with this device.
		mIgnoredDevices.put(ev.deviceId, di);
		Log.i(TAG, "Ignoring non-input device: id=0x"
		+ Integer.toHexString(di.id)
		+ ", name=" + di.name);
		}
		}
		} else if (ev.type == RawInputEvent.EV_DEVICE_REMOVED) {
		synchronized (mFirst) {
		if (false) {
		Log.i(TAG, "Device removed: id=0x"
		+ Integer.toHexString(ev.deviceId));
		}
		di = mDevices.get(ev.deviceId);
		if (di != null) {
		mDevices.delete(ev.deviceId);
		// The configuration may have changed because
		// of this device.
		configChanged = true;
		} else if ((di=mIgnoredDevices.get(ev.deviceId)) != null) {
		mIgnoredDevices.remove(ev.deviceId);
		} else {
		Log.w(TAG, "Bad device id: " + ev.deviceId);
		Log.w(TAG, "Removing bad device id: "
		+ Integer.toHexString(ev.deviceId));
		continue;
		}
		}
		} else {
		di = getInputDevice(ev.deviceId);
		if (di == null) {
		// This may be some junk from an ignored device.
		continue;
		}

		// first crack at it
		send = preprocessEvent(di, ev);
		@@ -422,10 +447,6 @@ public abstract class KeyInputQueue {
		}
		}

		if (di == null) {
		continue;
		}

		if (configChanged) {
		synchronized (mFirst) {
		addLocked(di, System.nanoTime(), 0,
		@@ -1056,28 +1077,33 @@ public abstract class KeyInputQueue {
		private InputDevice newInputDevice(int deviceId) {
		int classes = getDeviceClasses(deviceId);
		String name = getDeviceName(deviceId);
		InputDevice.AbsoluteInfo absX = null;
		InputDevice.AbsoluteInfo absY = null;
		InputDevice.AbsoluteInfo absPressure = null;
		InputDevice.AbsoluteInfo absSize = null;
		if (classes != 0) {
		Log.i(TAG, "Device added: id=0x" + Integer.toHexString(deviceId)
		+ ", name=" + name
		+ ", classes=" + Integer.toHexString(classes));
		InputDevice.AbsoluteInfo absX;
		InputDevice.AbsoluteInfo absY;
		InputDevice.AbsoluteInfo absPressure;
		InputDevice.AbsoluteInfo absSize;
		if ((classes&RawInputEvent.CLASS_TOUCHSCREEN_MT) != 0) {
		absX = loadAbsoluteInfo(deviceId, RawInputEvent.ABS_MT_POSITION_X, "X");
		absY = loadAbsoluteInfo(deviceId, RawInputEvent.ABS_MT_POSITION_Y, "Y");
		absPressure = loadAbsoluteInfo(deviceId, RawInputEvent.ABS_MT_TOUCH_MAJOR, "Pressure");
		absSize = loadAbsoluteInfo(deviceId, RawInputEvent.ABS_MT_WIDTH_MAJOR, "Size");
		absX = loadAbsoluteInfo(deviceId,
		RawInputEvent.ABS_MT_POSITION_X, "X");
		absY = loadAbsoluteInfo(deviceId,
		RawInputEvent.ABS_MT_POSITION_Y, "Y");
		absPressure = loadAbsoluteInfo(deviceId,
		RawInputEvent.ABS_MT_TOUCH_MAJOR, "Pressure");
		absSize = loadAbsoluteInfo(deviceId,
		RawInputEvent.ABS_MT_WIDTH_MAJOR, "Size");
		} else if ((classes&RawInputEvent.CLASS_TOUCHSCREEN) != 0) {
		absX = loadAbsoluteInfo(deviceId, RawInputEvent.ABS_X, "X");
		absY = loadAbsoluteInfo(deviceId, RawInputEvent.ABS_Y, "Y");
		absPressure = loadAbsoluteInfo(deviceId, RawInputEvent.ABS_PRESSURE, "Pressure");
		absSize = loadAbsoluteInfo(deviceId, RawInputEvent.ABS_TOOL_WIDTH, "Size");
		} else {
		absX = null;
		absY = null;
		absPressure = null;
		absSize = null;
		absX = loadAbsoluteInfo(deviceId,
		RawInputEvent.ABS_X, "X");
		absY = loadAbsoluteInfo(deviceId,
		RawInputEvent.ABS_Y, "Y");
		absPressure = loadAbsoluteInfo(deviceId,
		RawInputEvent.ABS_PRESSURE, "Pressure");
		absSize = loadAbsoluteInfo(deviceId,
		RawInputEvent.ABS_TOOL_WIDTH, "Size");
		}
		}

		return new InputDevice(deviceId, classes, name, absX, absY, absPressure, absSize);

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

+204 −22

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/am/ActivityManagerService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -12544,6 +12544,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		}

		mConfiguration = newConfig;
		Log.i(TAG, "Config changed: " + newConfig);

		Message msg = mHandler.obtainMessage(UPDATE_CONFIGURATION_MSG);
		msg.obj = new Configuration(mConfiguration);