Skip to content

Commit 461cd87

Browse files
author
Arpit Singh
committed
Cleanup hide_pointer_indicators_for_secure_windows flag
Flag is in nextfood so we can remove it. Bug: 325252005 Test: atest --host inputflinger_tests Flag: EXEMPT removing hide_pointer_indicators_for_secure_windows Change-Id: I8b1695d19e30f3bf15eb316edd99c0a61412df78
1 parent 7dab98e commit 461cd87

3 files changed

Lines changed: 3 additions & 22 deletions

File tree

libs/input/input_flags.aconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,6 @@ flag {
119119
bug: "330752824"
120120
}
121121

122-
flag {
123-
name: "hide_pointer_indicators_for_secure_windows"
124-
namespace: "input"
125-
description: "Hide touch and pointer indicators if a secure window is present on display"
126-
bug: "325252005"
127-
}
128-
129122
flag {
130123
name: "enable_keyboard_classifier"
131124
namespace: "input"

services/inputflinger/PointerChoreographer.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,9 +535,6 @@ void PointerChoreographer::processDeviceReset(const NotifyDeviceResetArgs& args)
535535
}
536536

537537
void PointerChoreographer::onControllerAddedOrRemovedLocked() {
538-
if (!com::android::input::flags::hide_pointer_indicators_for_secure_windows()) {
539-
return;
540-
}
541538
bool requireListener = !mTouchPointersByDevice.empty() || !mMousePointersByDisplay.empty() ||
542539
!mDrawingTabletPointersByDevice.empty() || !mStylusPointersByDevice.empty();
543540

services/inputflinger/tests/PointerChoreographer_test.cpp

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ class PointerChoreographerTest : public testing::Test {
129129
mInjectedInitialWindowInfos};
130130

131131
void SetUp() override {
132-
// flag overrides
133-
input_flags::hide_pointer_indicators_for_secure_windows(true);
134-
135132
ON_CALL(mMockPolicy, createPointerController).WillByDefault([this](ControllerType type) {
136133
std::shared_ptr<FakePointerController> pc = std::make_shared<FakePointerController>();
137134
EXPECT_FALSE(pc->isPointerShown());
@@ -2098,10 +2095,7 @@ TEST_P(SkipPointerScreenshotForPrivacySensitiveDisplaysTestFixture,
20982095
pc->assertSkipScreenshotFlagNotChanged();
20992096
}
21002097

2101-
TEST_F_WITH_FLAGS(
2102-
PointerChoreographerTest, HidesPointerScreenshotForExistingPrivacySensitiveWindows,
2103-
REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(com::android::input::flags,
2104-
hide_pointer_indicators_for_secure_windows))) {
2098+
TEST_F(PointerChoreographerTest, HidesPointerScreenshotForExistingPrivacySensitiveWindows) {
21052099
mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));
21062100

21072101
// Add a first mouse device
@@ -3158,11 +3152,8 @@ TEST_F(PointerChoreographerDisplayTopologyDefaultMouseDisplayTests,
31583152

31593153
class PointerChoreographerWindowInfoListenerTest : public testing::Test {};
31603154

3161-
TEST_F_WITH_FLAGS(
3162-
PointerChoreographerWindowInfoListenerTest,
3163-
doesNotCrashIfListenerCalledAfterPointerChoreographerDestroyed,
3164-
REQUIRES_FLAGS_ENABLED(ACONFIG_FLAG(com::android::input::flags,
3165-
hide_pointer_indicators_for_secure_windows))) {
3155+
TEST_F(PointerChoreographerWindowInfoListenerTest,
3156+
doesNotCrashIfListenerCalledAfterPointerChoreographerDestroyed) {
31663157
sp<android::gui::WindowInfosListener> registeredListener;
31673158
sp<android::gui::WindowInfosListener> localListenerCopy;
31683159
{

0 commit comments

Comments
 (0)