Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0182e8a3 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Automerger Merge Worker
Browse files

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

Change-Id: I94b93ea7343f14bd3a8f826073aded083fade0be
parents 4223a3f0 61ac9f94

services/core/jni/com_android_server_input_InputManagerService.cpp

+21 −21
Original line number Diff line number Diff line
@@ -237,27 +237,28 @@ public: 
    /* --- InputDispatcherPolicyInterface implementation --- */



    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 nsecs_t notifyANR(const sp<InputApplicationHandle>& inputApplicationHandle,

            const sp<IBinder>& token,

            const std::string& reason);

    virtual nsecs_t notifyAnr(const sp<InputApplicationHandle>& inputApplicationHandle,

                              const sp<IBinder>& token, const std::string& reason) override;

    virtual void notifyInputChannelBroken(const sp<IBinder>& token);

    virtual void notifyFocusChanged(const sp<IBinder>& oldToken, const sp<IBinder>& newToken);

    virtual bool filterInputEvent(const InputEvent* inputEvent, uint32_t policyFlags);

    virtual void getDispatcherConfiguration(InputDispatcherConfiguration* outConfig);

    virtual void interceptKeyBeforeQueueing(const KeyEvent* keyEvent, uint32_t& policyFlags);

    virtual void notifyFocusChanged(const sp<IBinder>& oldToken,

                                    const sp<IBinder>& newToken) override;

    virtual bool filterInputEvent(const InputEvent* inputEvent, uint32_t policyFlags) override;

    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,

            uint32_t& policyFlags);

    virtual nsecs_t interceptKeyBeforeDispatching(

            const sp<IBinder>& token,

            const KeyEvent* keyEvent, uint32_t policyFlags);

    virtual bool dispatchUnhandledKey(const sp<IBinder>& token,

            const KeyEvent* keyEvent, uint32_t policyFlags, KeyEvent* outFallbackKeyEvent);

    virtual void pokeUserActivity(nsecs_t eventTime, int32_t eventType);

    virtual bool checkInjectEventsPermissionNonReentrant(

            int32_t injectorPid, int32_t injectorUid);

    virtual void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken);

                                               uint32_t& policyFlags) override;

    virtual nsecs_t interceptKeyBeforeDispatching(const sp<IBinder>& token,

                                                  const KeyEvent* keyEvent,

                                                  uint32_t policyFlags) override;

    virtual bool dispatchUnhandledKey(const sp<IBinder>& token, const KeyEvent* keyEvent,

                                      uint32_t policyFlags, KeyEvent* outFallbackKeyEvent) override;

    virtual void pokeUserActivity(nsecs_t eventTime, int32_t eventType) override;

    virtual bool checkInjectEventsPermissionNonReentrant(int32_t injectorPid,

                                                         int32_t injectorUid) override;

    virtual void onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) override;



    /* --- PointerControllerPolicyInterface implementation --- */
@@ -692,8 +693,7 @@ static jobject getInputApplicationHandleObjLocalRef(JNIEnv* 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) {

#if DEBUG_INPUT_DISPATCHER_POLICY

    ALOGD("notifyANR");