diff options
author | Amit Pundir <amit.pundir@linaro.org> | 2014-05-27 08:21:35 +0530 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2014-05-27 08:21:35 +0530 |
commit | 2a938b266947bea231baf8c62e2de161c9cebf87 (patch) | |
tree | eee9ae8bcf757079bec802f009638ff66b7d66bb | |
parent | 6e1976fa176a760c130fd805db5a6a5bf0e13491 (diff) | |
parent | c9fcaf3751af078ad730913304431197e4d1ae80 (diff) | |
download | native-2a938b266947bea231baf8c62e2de161c9cebf87.tar.gz |
Merge masterlinaro-juno-master
* aosp/master:
Change InputMessage.motion.pointerSize to a uint32_t.
Ensure that app lib symlinks are correctly labeled when created.
-rw-r--r-- | cmds/installd/commands.c | 28 | ||||
-rw-r--r-- | include/input/InputTransport.h | 6 | ||||
-rw-r--r-- | libs/input/InputTransport.cpp | 16 |
3 files changed, 25 insertions, 25 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index cfb80e3ce4..70510a5256 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -85,13 +85,6 @@ int install(const char *pkgname, uid_t uid, gid_t gid, const char *seinfo) } } - if (symlink(applibdir, libsymlink) < 0) { - ALOGE("couldn't symlink directory '%s' -> '%s': %s\n", libsymlink, applibdir, - strerror(errno)); - unlink(pkgdir); - return -1; - } - if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) { ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno)); unlink(libsymlink); @@ -99,6 +92,13 @@ int install(const char *pkgname, uid_t uid, gid_t gid, const char *seinfo) return -errno; } + if (symlink(applibdir, libsymlink) < 0) { + ALOGE("couldn't symlink directory '%s' -> '%s': %s\n", libsymlink, applibdir, + strerror(errno)); + unlink(pkgdir); + return -1; + } + if (chown(pkgdir, uid, gid) < 0) { ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno)); unlink(libsymlink); @@ -241,13 +241,6 @@ int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* } } - if (symlink(applibdir, libsymlink) < 0) { - ALOGE("couldn't symlink directory for non-primary '%s' -> '%s': %s\n", libsymlink, - applibdir, strerror(errno)); - unlink(pkgdir); - return -1; - } - if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) { ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno)); unlink(libsymlink); @@ -255,6 +248,13 @@ int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* return -errno; } + if (symlink(applibdir, libsymlink) < 0) { + ALOGE("couldn't symlink directory for non-primary '%s' -> '%s': %s\n", libsymlink, + applibdir, strerror(errno)); + unlink(pkgdir); + return -1; + } + if (chown(pkgdir, uid, uid) < 0) { ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno)); unlink(libsymlink); diff --git a/include/input/InputTransport.h b/include/input/InputTransport.h index 609b6799f7..8ffdfca0d2 100644 --- a/include/input/InputTransport.h +++ b/include/input/InputTransport.h @@ -86,7 +86,7 @@ struct InputMessage { float yOffset; float xPrecision; float yPrecision; - size_t pointerCount; + uint32_t pointerCount; struct Pointer { PointerProperties properties; PointerCoords coords; @@ -234,7 +234,7 @@ public: float yPrecision, nsecs_t downTime, nsecs_t eventTime, - size_t pointerCount, + uint32_t pointerCount, const PointerProperties* pointerProperties, const PointerCoords* pointerCoords); @@ -360,7 +360,7 @@ private: void initializeFrom(const InputMessage* msg) { eventTime = msg->body.motion.eventTime; idBits.clear(); - for (size_t i = 0; i < msg->body.motion.pointerCount; i++) { + for (uint32_t i = 0; i < msg->body.motion.pointerCount; i++) { uint32_t id = msg->body.motion.pointers[i].properties.id; idBits.markBit(id); idToIndex[id] = i; diff --git a/libs/input/InputTransport.cpp b/libs/input/InputTransport.cpp index 09b2e7c5c9..2d0fb8c110 100644 --- a/libs/input/InputTransport.cpp +++ b/libs/input/InputTransport.cpp @@ -292,7 +292,7 @@ status_t InputPublisher::publishMotionEvent( float yPrecision, nsecs_t downTime, nsecs_t eventTime, - size_t pointerCount, + uint32_t pointerCount, const PointerProperties* pointerProperties, const PointerCoords* pointerCoords) { #if DEBUG_TRANSPORT_ACTIONS @@ -334,7 +334,7 @@ status_t InputPublisher::publishMotionEvent( msg.body.motion.downTime = downTime; msg.body.motion.eventTime = eventTime; msg.body.motion.pointerCount = pointerCount; - for (size_t i = 0; i < pointerCount; i++) { + for (uint32_t i = 0; i < pointerCount; i++) { msg.body.motion.pointers[i].properties.copyFrom(pointerProperties[i]); msg.body.motion.pointers[i].coords.copyFrom(pointerCoords[i]); } @@ -654,7 +654,7 @@ void InputConsumer::updateTouchState(InputMessage* msg) { } void InputConsumer::rewriteMessage(const TouchState& state, InputMessage* msg) { - for (size_t i = 0; i < msg->body.motion.pointerCount; i++) { + for (uint32_t i = 0; i < msg->body.motion.pointerCount; i++) { uint32_t id = msg->body.motion.pointers[i].properties.id; if (state.lastResample.idBits.hasBit(id)) { PointerCoords& msgCoords = msg->body.motion.pointers[i].coords; @@ -894,10 +894,10 @@ void InputConsumer::initializeKeyEvent(KeyEvent* event, const InputMessage* msg) } void InputConsumer::initializeMotionEvent(MotionEvent* event, const InputMessage* msg) { - size_t pointerCount = msg->body.motion.pointerCount; + uint32_t pointerCount = msg->body.motion.pointerCount; PointerProperties pointerProperties[pointerCount]; PointerCoords pointerCoords[pointerCount]; - for (size_t i = 0; i < pointerCount; i++) { + for (uint32_t i = 0; i < pointerCount; i++) { pointerProperties[i].copyFrom(msg->body.motion.pointers[i].properties); pointerCoords[i].copyFrom(msg->body.motion.pointers[i].coords); } @@ -922,9 +922,9 @@ void InputConsumer::initializeMotionEvent(MotionEvent* event, const InputMessage } void InputConsumer::addSample(MotionEvent* event, const InputMessage* msg) { - size_t pointerCount = msg->body.motion.pointerCount; + uint32_t pointerCount = msg->body.motion.pointerCount; PointerCoords pointerCoords[pointerCount]; - for (size_t i = 0; i < pointerCount; i++) { + for (uint32_t i = 0; i < pointerCount; i++) { pointerCoords[i].copyFrom(msg->body.motion.pointers[i].coords); } @@ -934,7 +934,7 @@ void InputConsumer::addSample(MotionEvent* event, const InputMessage* msg) { bool InputConsumer::canAddSample(const Batch& batch, const InputMessage *msg) { const InputMessage& head = batch.samples.itemAt(0); - size_t pointerCount = msg->body.motion.pointerCount; + uint32_t pointerCount = msg->body.motion.pointerCount; if (head.body.motion.pointerCount != pointerCount || head.body.motion.action != msg->body.motion.action) { return false; |