Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up InputChannel file descriptor data type."

Browse Source
This commit is contained in:
Jeff Brown
2012-02-14 17:11:41 -08:00
committed by Android (Google) Code Review
parent 79952ee29a 91e328984c
commit 91ec0b722f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_view_InputChannel.cpp
View File

@@ -199,9 +199,9 @@ static void android_view_InputChannel_nativeReadFromParcel(JNIEnv* env, jobject
bool isInitialized = parcel->readInt32();
if (isInitialized) {
String8 name = parcel->readString8();
int32_t rawFd = parcel->readFileDescriptor();
int32_t dupFd = dup(rawFd);
if (rawFd < 0) {
int rawFd = parcel->readFileDescriptor();
int dupFd = dup(rawFd);
if (dupFd < 0) {
ALOGE("Error %d dup channel fd %d.", errno, rawFd);
jniThrowRuntimeException(env,
"Could not read input channel file descriptors from parcel.");

2
core/jni/android_view_InputEventReceiver.cpp
View File

@@ -93,7 +93,7 @@ NativeInputEventReceiver::~NativeInputEventReceiver() {
}
status_t NativeInputEventReceiver::initialize() {
int32_t receiveFd = mInputConsumer.getChannel()->getFd();
int receiveFd = mInputConsumer.getChannel()->getFd();
mLooper->addFd(receiveFd, 0, ALOOPER_EVENT_INPUT, handleReceiveCallback, this);
return OK;
}

6
include/ui/InputTransport.h
View File

@@ -123,7 +123,7 @@ protected:
virtual ~InputChannel();
public:
InputChannel(const String8& name, int32_t fd);
InputChannel(const String8& name, int fd);
/* Creates a pair of input channels.
*
@@ -133,7 +133,7 @@ public:
sp<InputChannel>& outServerChannel, sp<InputChannel>& outClientChannel);
inline String8 getName() const { return mName; }
inline int32_t getFd() const { return mFd; }
inline int getFd() const { return mFd; }
/* Sends a message to the other endpoint.
*
@@ -162,7 +162,7 @@ public:
private:
String8 mName;
int32_t mFd;
int mFd;
};
/*

2
services/input/InputDispatcher.cpp
View File

@@ -3105,7 +3105,7 @@ status_t InputDispatcher::registerInputChannel(const sp<InputChannel>& inputChan
sp<Connection> connection = new Connection(inputChannel, inputWindowHandle, monitor);
int32_t fd = inputChannel->getFd();
int fd = inputChannel->getFd();
mConnectionsByFd.add(fd, connection);
if (monitor) {