InputDispatcher: Fix support for INPUT_FEATURE_NO_INPUT_CHANNEL am: 2984b7af4f (8445b678) · Commits · e / os / platform_frameworks_native

include/input/InputWindow.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -213,7 +213,7 @@ public:
	}		}

	inline std::string getName() const {		inline std::string getName() const {
	return mInfo.token ? mInfo.name : "<invalid>";		return !mInfo.name.empty() ? mInfo.name : "<invalid>";
	}		}

	inline nsecs_t getDispatchingTimeout(nsecs_t defaultValue) const {		inline nsecs_t getDispatchingTimeout(nsecs_t defaultValue) const {

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ bool InputWindowInfo::overlaps(const InputWindowInfo* other) const {
	}		}

	status_t InputWindowInfo::write(Parcel& output) const {		status_t InputWindowInfo::write(Parcel& output) const {
	if (token == nullptr) {		if (name.empty()) {
	output.writeInt32(0);		output.writeInt32(0);
	return OK;		return OK;
	}		}
	@@ -110,12 +110,7 @@ InputWindowInfo InputWindowInfo::read(const Parcel& from) {
	return ret;		return ret;
	}		}

	sp<IBinder> token = from.readStrongBinder();		ret.token = from.readStrongBinder();
	if (token == nullptr) {
	return ret;
	}

	ret.token = token;
	ret.id = from.readInt32();		ret.id = from.readInt32();
	ret.name = from.readString8().c_str();		ret.name = from.readString8().c_str();
	ret.layoutParamsFlags = from.readInt32();		ret.layoutParamsFlags = from.readInt32();

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3598,9 +3598,9 @@ void InputDispatcher::updateWindowHandlesForDisplayLocked(
	if (canReceiveInput && !noInputChannel) {		if (canReceiveInput && !noInputChannel) {
	ALOGV("Window handle %s has no registered input channel",		ALOGV("Window handle %s has no registered input channel",
	handle->getName().c_str());		handle->getName().c_str());
	}
	continue;		continue;
	}		}
			}

	if (info->displayId != displayId) {		if (info->displayId != displayId) {
	ALOGE("Window %s updated by wrong display %d, should belong to display %d",		ALOGE("Window %s updated by wrong display %d, should belong to display %d",