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

Merge "Rename ANR -> Anr to conform to code style" into rvc-dev am: 61ac9f9478

Browse Source 
Change-Id: I94b93ea7343f14bd3a8f826073aded083fade0be
This commit is contained in:
Siarhei Vishniakou
2020-05-07 16:50:24 +00:00
committed by Automerger Merge Worker
parent 4223a3f0ef 61ac9f9478
commit 0182e8a30a
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,27 +237,28 @@ public:
/* --- InputDispatcherPolicyInterface implementation --- */ /* --- InputDispatcherPolicyInterface implementation --- */
virtual void notifySwitch(nsecs_t when, uint32_t switchValues, uint32_t switchMask, virtual void notifySwitch(nsecs_t when, uint32_t switchValues, uint32_t switchMask,
uint32_t policyFlags); uint32_t policyFlags) override;
virtual void notifyConfigurationChanged(nsecs_t when); virtual void notifyConfigurationChanged(nsecs_t when);
virtual nsecs_t notifyANR(const sp<InputApplicationHandle>& inputApplicationHandle, virtual nsecs_t notifyAnr(const sp<InputApplicationHandle>& inputApplicationHandle,
const sp<IBinder>& token, const sp<IBinder>& token, const std::string& reason) override;
const std::string& reason);
virtual void notifyInputChannelBroken(const sp<IBinder>& token); virtual void notifyInputChannelBroken(const sp<IBinder>& token);
virtual void notifyFocusChanged(const sp<IBinder>& oldToken, const sp<IBinder>& newToken); virtual void notifyFocusChanged(const sp<IBinder>& oldToken,
virtual bool filterInputEvent(const InputEvent* inputEvent, uint32_t policyFlags); const sp<IBinder>& newToken) override;
virtual void getDispatcherConfiguration(InputDispatcherConfiguration* outConfig); virtual bool filterInputEvent(const InputEvent* inputEvent, uint32_t policyFlags) override;
virtual void interceptKeyBeforeQueueing(const KeyEvent* keyEvent, uint32_t& policyFlags); virtual void getDispatcherConfiguration(InputDispatcherConfiguration* outConfig) override;
virtual void interceptKeyBeforeQueueing(const KeyEvent* keyEvent,
uint32_t& policyFlags) override;
virtual void interceptMotionBeforeQueueing(const int32_t displayId, nsecs_t when, virtual void interceptMotionBeforeQueueing(const int32_t displayId, nsecs_t when,
uint32_t& policyFlags); uint32_t& policyFlags) override;
virtual nsecs_t interceptKeyBeforeDispatching( virtual nsecs_t interceptKeyBeforeDispatching(const sp<IBinder>& token,
const sp<IBinder>& token, const KeyEvent* keyEvent,
const KeyEvent* keyEvent, uint32_t policyFlags); uint32_t policyFlags) override;
virtual bool dispatchUnhandledKey(const sp<IBinder>& token, virtual bool dispatchUnhandledKey(const sp<IBinder>& token, const KeyEvent* keyEvent,
const KeyEvent* keyEvent, uint32_t policyFlags, KeyEvent* outFallbackKeyEvent); uint32_t policyFlags, KeyEvent* outFallbackKeyEvent) override;
virtual void pokeUserActivity(nsecs_t eventTime, int32_t eventType); virtual void pokeUserActivity(nsecs_t eventTime, int32_t eventType) override;
virtual bool checkInjectEventsPermissionNonReentrant( virtual bool checkInjectEventsPermissionNonReentrant(int32_t injectorPid,
int32_t injectorPid, int32_t injectorUid); int32_t injectorUid) override;
virtual void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken); virtual void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) override;
/* --- PointerControllerPolicyInterface implementation --- */ /* --- PointerControllerPolicyInterface implementation --- */
@@ -692,8 +693,7 @@ static jobject getInputApplicationHandleObjLocalRef(JNIEnv* env,
return handle->getInputApplicationHandleObjLocalRef(env); return handle->getInputApplicationHandleObjLocalRef(env);
} }
nsecs_t NativeInputManager::notifyAnr(const sp<InputApplicationHandle>& inputApplicationHandle,
nsecs_t NativeInputManager::notifyANR(const sp<InputApplicationHandle>& inputApplicationHandle,
const sp<IBinder>& token, const std::string& reason) { const sp<IBinder>& token, const std::string& reason) {
#if DEBUG_INPUT_DISPATCHER_POLICY #if DEBUG_INPUT_DISPATCHER_POLICY
ALOGD("notifyANR"); ALOGD("notifyANR");