Snap for 8462842 from 80a719017121bf1c810fa19aa00a54bc837b5234 to tm-qpr1-release (d4287452) · Commits · e / os / platform_frameworks_native

libs/ui/Gralloc4.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -1193,10 +1193,6 @@ std::string Gralloc4Mapper::dumpBuffers(bool less) const {

		Gralloc4Allocator::Gralloc4Allocator(const Gralloc4Mapper& mapper) : mMapper(mapper) {
		mAllocator = IAllocator::getService();
		if (mAllocator == nullptr) {
		ALOGW("allocator 4.x is not supported");
		return;
		}
		if (__builtin_available(android 31, *)) {
		if (hasIAllocatorAidl()) {
		mAidlAllocator = AidlIAllocator::fromBinder(ndk::SpAIBinder(
		@@ -1204,10 +1200,14 @@ Gralloc4Allocator::Gralloc4Allocator(const Gralloc4Mapper& mapper) : mMapper(map
		ALOGE_IF(!mAidlAllocator, "AIDL IAllocator declared but failed to get service");
		}
		}
		if (mAllocator == nullptr && mAidlAllocator == nullptr) {
		ALOGW("allocator 4.x is not supported");
		return;
		}
		}

		bool Gralloc4Allocator::isLoaded() const {
		return mAllocator != nullptr;
		return mAllocator != nullptr \|\| mAidlAllocator != nullptr;
		}

		std::string Gralloc4Allocator::dumpDebugInfo(bool less) const {

services/inputflinger/reader/mapper/KeyboardInputMapper.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -428,6 +428,8 @@ void KeyboardInputMapper::initializeLedState(LedState& ledState, int32_t led) {
		}

		void KeyboardInputMapper::updateLedState(bool reset) {
		// Clear the local led state then union the global led state.
		mMetaState &= ~(AMETA_CAPS_LOCK_ON \| AMETA_NUM_LOCK_ON \| AMETA_SCROLL_LOCK_ON);
		mMetaState \|= getContext()->getLedMetaState();

		constexpr int32_t META_NUM = 3;

services/inputflinger/tests/InputReader_test.cpp

+72 −0

Original line number	Diff line number	Diff line
		@@ -4007,6 +4007,78 @@ TEST_F(KeyboardInputMapperTest, Process_toggleCapsLockState) {
		ASSERT_EQ(AMETA_CAPS_LOCK_ON, mapper.getMetaState());
		}

		TEST_F(KeyboardInputMapperTest, Process_LockedKeysShouldToggleInMultiDevices) {
		// keyboard 1.
		mFakeEventHub->addLed(EVENTHUB_ID, LED_CAPSL, true /initially on/);
		mFakeEventHub->addLed(EVENTHUB_ID, LED_NUML, false /initially off/);
		mFakeEventHub->addLed(EVENTHUB_ID, LED_SCROLLL, false /initially off/);
		mFakeEventHub->addKey(EVENTHUB_ID, KEY_CAPSLOCK, 0, AKEYCODE_CAPS_LOCK, 0);
		mFakeEventHub->addKey(EVENTHUB_ID, KEY_NUMLOCK, 0, AKEYCODE_NUM_LOCK, 0);
		mFakeEventHub->addKey(EVENTHUB_ID, KEY_SCROLLLOCK, 0, AKEYCODE_SCROLL_LOCK, 0);

		KeyboardInputMapper& mapper1 =
		addMapperAndConfigure<KeyboardInputMapper>(AINPUT_SOURCE_KEYBOARD,
		AINPUT_KEYBOARD_TYPE_ALPHABETIC);

		// keyboard 2.
		const std::string USB2 = "USB2";
		const std::string DEVICE_NAME2 = "KEYBOARD2";
		constexpr int32_t SECOND_DEVICE_ID = DEVICE_ID + 1;
		constexpr int32_t SECOND_EVENTHUB_ID = EVENTHUB_ID + 1;
		std::shared_ptr<InputDevice> device2 =
		newDevice(SECOND_DEVICE_ID, DEVICE_NAME2, USB2, SECOND_EVENTHUB_ID,
		ftl::Flags<InputDeviceClass>(0));
		mFakeEventHub->addLed(SECOND_EVENTHUB_ID, LED_CAPSL, true /initially on/);
		mFakeEventHub->addLed(SECOND_EVENTHUB_ID, LED_NUML, false /initially off/);
		mFakeEventHub->addLed(SECOND_EVENTHUB_ID, LED_SCROLLL, false /initially off/);
		mFakeEventHub->addKey(SECOND_EVENTHUB_ID, KEY_CAPSLOCK, 0, AKEYCODE_CAPS_LOCK, 0);
		mFakeEventHub->addKey(SECOND_EVENTHUB_ID, KEY_NUMLOCK, 0, AKEYCODE_NUM_LOCK, 0);
		mFakeEventHub->addKey(SECOND_EVENTHUB_ID, KEY_SCROLLLOCK, 0, AKEYCODE_SCROLL_LOCK, 0);

		KeyboardInputMapper& mapper2 =
		device2->addMapper<KeyboardInputMapper>(SECOND_EVENTHUB_ID, AINPUT_SOURCE_KEYBOARD,
		AINPUT_KEYBOARD_TYPE_ALPHABETIC);
		device2->configure(ARBITRARY_TIME, mFakePolicy->getReaderConfiguration(), 0 /changes/);
		device2->reset(ARBITRARY_TIME);

		// Initial metastate is AMETA_NUM_LOCK_ON, turn it off.
		ASSERT_TRUE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_NUML));
		ASSERT_EQ(AMETA_NUM_LOCK_ON, mapper1.getMetaState());
		ASSERT_EQ(AMETA_NUM_LOCK_ON, mapper2.getMetaState());

		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_NUMLOCK, 1);
		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_NUMLOCK, 0);
		ASSERT_FALSE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_NUML));
		ASSERT_EQ(AMETA_NONE, mapper1.getMetaState());
		ASSERT_EQ(AMETA_NONE, mapper2.getMetaState());

		// Toggle caps lock on and off.
		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 1);
		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 0);
		ASSERT_TRUE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_CAPSL));
		ASSERT_EQ(AMETA_CAPS_LOCK_ON, mapper1.getMetaState());
		ASSERT_EQ(AMETA_CAPS_LOCK_ON, mapper2.getMetaState());

		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 1);
		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_CAPSLOCK, 0);
		ASSERT_FALSE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_CAPSL));
		ASSERT_EQ(AMETA_NONE, mapper1.getMetaState());
		ASSERT_EQ(AMETA_NONE, mapper2.getMetaState());

		// Toggle scroll lock on and off.
		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 1);
		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 0);
		ASSERT_TRUE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_SCROLLL));
		ASSERT_EQ(AMETA_SCROLL_LOCK_ON, mapper1.getMetaState());
		ASSERT_EQ(AMETA_SCROLL_LOCK_ON, mapper2.getMetaState());

		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 1);
		process(mapper1, ARBITRARY_TIME, READ_TIME, EV_KEY, KEY_SCROLLLOCK, 0);
		ASSERT_FALSE(mFakeEventHub->getLedState(EVENTHUB_ID, LED_SCROLLL));
		ASSERT_EQ(AMETA_NONE, mapper1.getMetaState());
		ASSERT_EQ(AMETA_NONE, mapper2.getMetaState());
		}

		// --- KeyboardInputMapperTest_ExternalDevice ---

		class KeyboardInputMapperTest_ExternalDevice : public InputMapperTest {