summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <>2009-03-25 17:24:35 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-25 17:24:35 -0700
commiteecc5c973ed44a4a094ef3c36130ee008f384333 (patch)
tree8363f9204164ca0e8690cc809c1114935e502688
parent9ed4a4b0d7dadeadd57bd81e2cc538670d9654b9 (diff)
downloadframeworks_base-eecc5c973ed44a4a094ef3c36130ee008f384333.zip
frameworks_base-eecc5c973ed44a4a094ef3c36130ee008f384333.tar.gz
frameworks_base-eecc5c973ed44a4a094ef3c36130ee008f384333.tar.bz2
Automated import from //branches/donutburger/...@142727,142727
-rw-r--r--libs/ui/EventHub.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp
index 3b29b09..7c2fc8e 100644
--- a/libs/ui/EventHub.cpp
+++ b/libs/ui/EventHub.cpp
@@ -245,6 +245,7 @@ EventHub::device_t* EventHub::getDevice(int32_t deviceId) const
int32_t id = deviceId & ID_MASK;
if (id >= mNumDevicesById || id < 0) return NULL;
device_t* dev = mDevicesById[id].device;
+ if (dev == NULL) return NULL;
if (dev->id == deviceId) {
return dev;
}