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

Commit a47a4d4f authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Use bitset api in InputClassifier 

We are currently doing some custom manipulations with bits in
InputClassifier. But the manipulations are making incorrect assumptions
about the behaviour of the bitset apis.

To maximize consistency, extend the use of bitset apis to
InputClassifier. This allows the same apis to be used in the HAL in
order to read the axis values.

Bug: 131927078
Test: atest inputflinger_tests

Change-Id: Icab062c695ca07d5cc404082d3de7b334cbc0e19
parent f96a6770

services/inputflinger/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ cc_library_shared { 


    srcs: [

        "InputClassifier.cpp",

        "InputClassifierConverter.cpp",

        "InputDispatcher.cpp",

        "InputManager.cpp",

    ],

services/inputflinger/InputClassifier.cpp

+3 −368

File changed.

Preview size limit exceeded, changes collapsed.

services/inputflinger/InputClassifierConverter.cpp

0 → 100644
+384 −0

File added.

Preview size limit exceeded, changes collapsed.

services/inputflinger/InputClassifierConverter.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef _UI_INPUT_CLASSIFIER_CONVERTER_H

#define _UI_INPUT_CLASSIFIER_CONVERTER_H



#include "InputListener.h"

#include <android/hardware/input/common/1.0/types.h>





namespace android {



/**

 * Convert from framework's NotifyMotionArgs to hidl's common::V1_0::MotionEvent

 */

::android::hardware::input::common::V1_0::MotionEvent notifyMotionArgsToHalMotionEvent(

        const NotifyMotionArgs& args);



} // namespace android



#endif // _UI_INPUT_CLASSIFIER_CONVERTER_H

services/inputflinger/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ cc_test { 
        "BlockingQueue_test.cpp",

        "TestInputListener.cpp",

        "InputClassifier_test.cpp",

        "InputClassifierConverter_test.cpp",

        "InputDispatcher_test.cpp",

        "InputReader_test.cpp",

    ],