summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorDianne Hackborn <>2009-03-25 15:32:28 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-25 15:32:28 -0700
commit11d93f968ca515cd448ef51e4d8b79e3de561475 (patch)
tree744087cc7859e374bea152550db775514afbdb66 /libs
parentdf351ba57378ee9e58cf0b0cd1ff6d4700052ec6 (diff)
downloadframeworks_native-11d93f968ca515cd448ef51e4d8b79e3de561475.zip
frameworks_native-11d93f968ca515cd448ef51e4d8b79e3de561475.tar.gz
frameworks_native-11d93f968ca515cd448ef51e4d8b79e3de561475.tar.bz2
Automated import from //branches/cupcake/...@142663,142663
Diffstat (limited to 'libs')
-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;
}