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

Commit 1fefefce authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

Merge "Migrate pointer choreographer to use a new aconfig flag" into main

parents 66c5422a 0c791df3

services/core/jni/com_android_server_input_InputManagerService.cpp

+4 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <android_view_VerifiedMotionEvent.h>

#include <batteryservice/include/batteryservice/BatteryServiceConstants.h>

#include <binder/IServiceManager.h>

#include <com_android_input_flags.h>

#include <input/Input.h>

#include <input/PointerController.h>

#include <input/SpriteController.h>
@@ -81,6 +82,8 @@ static constexpr std::chrono::duration MAX_VIBRATE_PATTERN_DELAY = 100s; 
static constexpr std::chrono::milliseconds MAX_VIBRATE_PATTERN_DELAY_MILLIS =

        std::chrono::duration_cast<std::chrono::milliseconds>(MAX_VIBRATE_PATTERN_DELAY);



namespace input_flags = com::android::input::flags;



namespace android {



// The exponent used to calculate the pointer speed scaling factor.
@@ -733,7 +736,7 @@ std::shared_ptr<PointerControllerInterface> NativeInputManager::obtainPointerCon 
        ensureSpriteControllerLocked();



        static const bool ENABLE_POINTER_CHOREOGRAPHER =

                sysprop::InputProperties::enable_pointer_choreographer().value_or(false);

                input_flags::enable_pointer_choreographer();



        // Disable the functionality of the legacy PointerController if PointerChoreographer is

        // enabled.