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

Commit 28f6a526 authored by Liana Kazanova's avatar Liana Kazanova Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Remove notifyConfigurationChanged policy call"" into main

parents d241b3f2 78243db0

services/core/java/com/android/server/input/InputManagerService.java

+3 −6
Original line number Diff line number Diff line
@@ -2222,12 +2222,6 @@ public class InputManagerService extends IInputManager.Stub 
        mNative.monitor();

    }



    // Native callback.

    @SuppressWarnings("unused")

    private void notifyConfigurationChanged(long whenNanos) {

        mWindowManagerCallbacks.notifyConfigurationChanged();

    }



    // Native callback.

    @SuppressWarnings("unused")

    private void notifyInputDevicesChanged(InputDevice[] inputDevices) {
@@ -2240,6 +2234,9 @@ public class InputManagerService extends IInputManager.Stub 


            mInputDevices = inputDevices;

        }

        // Input device change can possibly change configuration, so notify window manager to update

        // its configuration.

        mWindowManagerCallbacks.notifyConfigurationChanged();

    }



    // Native callback.

services/core/jni/com_android_server_input_InputManagerService.cpp

+0 −17
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ static const char* VELOCITYTRACKER_STRATEGY = "velocitytracker_strategy"; 


static struct {

    jclass clazz;

    jmethodID notifyConfigurationChanged;

    jmethodID notifyInputDevicesChanged;

    jmethodID notifySwitch;

    jmethodID notifyInputChannelBroken;
@@ -314,7 +313,6 @@ public: 


    void getReaderConfiguration(InputReaderConfiguration* outConfig) override;

    void notifyInputDevicesChanged(const std::vector<InputDeviceInfo>& inputDevices) override;

    void notifyConfigurationChanged(nsecs_t when) override;

    std::shared_ptr<KeyCharacterMap> getKeyboardLayoutOverlay(

            const InputDeviceIdentifier& identifier,

            const std::optional<KeyboardLayoutInfo> keyboardLayoutInfo) override;
@@ -940,18 +938,6 @@ void NativeInputManager::notifySwitch(nsecs_t when, 
    checkAndClearExceptionFromCallback(env, "notifySwitch");

}



void NativeInputManager::notifyConfigurationChanged(nsecs_t when) {

#if DEBUG_INPUT_DISPATCHER_POLICY

    ALOGD("notifyConfigurationChanged - when=%lld", when);

#endif

    ATRACE_CALL();



    JNIEnv* env = jniEnv();



    env->CallVoidMethod(mServiceObj, gServiceClassInfo.notifyConfigurationChanged, when);

    checkAndClearExceptionFromCallback(env, "notifyConfigurationChanged");

}



static jobject getInputApplicationHandleObjLocalRef(

        JNIEnv* env, const std::shared_ptr<InputApplicationHandle>& inputApplicationHandle) {

    if (inputApplicationHandle == nullptr) {
@@ -2873,9 +2859,6 @@ int register_android_server_InputManager(JNIEnv* env) { 
    FIND_CLASS(clazz, "com/android/server/input/InputManagerService");

    gServiceClassInfo.clazz = reinterpret_cast<jclass>(env->NewGlobalRef(clazz));



    GET_METHOD_ID(gServiceClassInfo.notifyConfigurationChanged, clazz,

            "notifyConfigurationChanged", "(J)V");



    GET_METHOD_ID(gServiceClassInfo.notifyInputDevicesChanged, clazz,

            "notifyInputDevicesChanged", "([Landroid/view/InputDevice;)V");