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

Merge "Use sequence numbers to synchronize enabling Pointer Capture (2/2)" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-23 09:57:40 +00:00
committed by Android (Google) Code Review
parent 068f82dd52 56e3f4e527
commit 977ab888a5
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -337,7 +337,7 @@ public:
void pokeUserActivity(nsecs_t eventTime, int32_t eventType, int32_t displayId) override; void pokeUserActivity(nsecs_t eventTime, int32_t eventType, int32_t displayId) override;
bool checkInjectEventsPermissionNonReentrant(int32_t injectorPid, int32_t injectorUid) override; bool checkInjectEventsPermissionNonReentrant(int32_t injectorPid, int32_t injectorUid) override;
void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) override; void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) override;
void setPointerCapture(bool enabled) override; void setPointerCapture(const PointerCaptureRequest& request) override;
void notifyDropWindow(const sp<IBinder>& token, float x, float y) override; void notifyDropWindow(const sp<IBinder>& token, float x, float y) override;
/* --- PointerControllerPolicyInterface implementation --- */ /* --- PointerControllerPolicyInterface implementation --- */
@@ -372,8 +372,8 @@ private:
// Show touches feature enable/disable. // Show touches feature enable/disable.
bool showTouches; bool showTouches;
// Pointer capture feature enable/disable. // The latest request to enable or disable Pointer Capture.
bool pointerCapture; PointerCaptureRequest pointerCaptureRequest;
// Sprite controller singleton, created on first use. // Sprite controller singleton, created on first use.
sp<SpriteController> spriteController; sp<SpriteController> spriteController;
@@ -417,7 +417,6 @@ NativeInputManager::NativeInputManager(jobject contextObj,
mLocked.pointerSpeed = 0; mLocked.pointerSpeed = 0;
mLocked.pointerGesturesEnabled = true; mLocked.pointerGesturesEnabled = true;
mLocked.showTouches = false; mLocked.showTouches = false;
mLocked.pointerCapture = false;
mLocked.pointerDisplayId = ADISPLAY_ID_DEFAULT; mLocked.pointerDisplayId = ADISPLAY_ID_DEFAULT;
} }
mInteractive = true; mInteractive = true;
@@ -446,7 +445,9 @@ void NativeInputManager::dump(std::string& dump) {
dump += StringPrintf(INDENT "Pointer Gestures Enabled: %s\n", dump += StringPrintf(INDENT "Pointer Gestures Enabled: %s\n",
toString(mLocked.pointerGesturesEnabled)); toString(mLocked.pointerGesturesEnabled));
dump += StringPrintf(INDENT "Show Touches: %s\n", toString(mLocked.showTouches)); dump += StringPrintf(INDENT "Show Touches: %s\n", toString(mLocked.showTouches));
dump += StringPrintf(INDENT "Pointer Capture Enabled: %s\n", toString(mLocked.pointerCapture)); dump += StringPrintf(INDENT "Pointer Capture: %s, seq=%" PRIu32 "\n",
mLocked.pointerCaptureRequest.enable ? "Enabled" : "Disabled",
mLocked.pointerCaptureRequest.seq);
} }
dump += "\n"; dump += "\n";
@@ -634,7 +635,7 @@ void NativeInputManager::getReaderConfiguration(InputReaderConfiguration* outCon
outConfig->showTouches = mLocked.showTouches; outConfig->showTouches = mLocked.showTouches;
outConfig->pointerCapture = mLocked.pointerCapture; outConfig->pointerCaptureRequest = mLocked.pointerCaptureRequest;
outConfig->setDisplayViewports(mLocked.viewports); outConfig->setDisplayViewports(mLocked.viewports);
@@ -1383,16 +1384,16 @@ void NativeInputManager::onPointerDownOutsideFocus(const sp<IBinder>& touchedTok
checkAndClearExceptionFromCallback(env, "onPointerDownOutsideFocus"); checkAndClearExceptionFromCallback(env, "onPointerDownOutsideFocus");
} }
void NativeInputManager::setPointerCapture(bool enabled) { void NativeInputManager::setPointerCapture(const PointerCaptureRequest& request) {
{ // acquire lock { // acquire lock
AutoMutex _l(mLock); AutoMutex _l(mLock);
if (mLocked.pointerCapture == enabled) { if (mLocked.pointerCaptureRequest == request) {
return; return;
} }
ALOGV("%s pointer capture.", enabled ? "Enabling" : "Disabling"); ALOGV("%s pointer capture.", request.enable ? "Enabling" : "Disabling");
mLocked.pointerCapture = enabled; mLocked.pointerCaptureRequest = request;
} // release lock } // release lock
mInputManager->getReader()->requestRefreshConfiguration( mInputManager->getReader()->requestRefreshConfiguration(