InputDispatcher: Fix support for INPUT_FEATURE_NO_INPUT_CHANNEL am: 2984b7af4f... (4c2845f4) · Commits · e / os / android_frameworks_native-old

include/input/InputWindow.h

+1 −1

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

		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 {

+2 −7

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

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

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

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

+1 −1

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

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