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

Commit 2360ca49 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use WindowInfosUpdate in android_window_WindowInfosListener" into main

parents d938ca87 9ed216ce

core/jni/android_window_WindowInfosListener.cpp

+5 −3
Original line number Diff line number Diff line
@@ -143,11 +143,13 @@ void destroyNativeService(void* ptr) { 


jobject nativeRegister(JNIEnv* env, jclass clazz, jlong ptr) {

    sp<WindowInfosListener> listener = reinterpret_cast<WindowInfosListener*>(ptr);

    std::pair<std::vector<gui::WindowInfo>, std::vector<gui::DisplayInfo>> initialInfo;

    gui::WindowInfosUpdate initialInfo;

    SurfaceComposerClient::getDefault()->addWindowInfosListener(listener, &initialInfo);



    ScopedLocalRef<jobjectArray> jWindowHandlesArray(env, fromWindowInfos(env, initialInfo.first));

    ScopedLocalRef<jobjectArray> jDisplayInfoArray(env, fromDisplayInfos(env, initialInfo.second));

    ScopedLocalRef<jobjectArray> jWindowHandlesArray(env,

                                                     fromWindowInfos(env, initialInfo.windowInfos));

    ScopedLocalRef<jobjectArray> jDisplayInfoArray(env,

                                                   fromDisplayInfos(env, initialInfo.displayInfos));



    return env->NewObject(gPairClassInfo.clazz, gPairClassInfo.ctor, jWindowHandlesArray.get(),

                          jDisplayInfoArray.get());

libs/input/PointerController.cpp

+2 −3
Original line number Diff line number Diff line
@@ -105,11 +105,10 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>& 
      : PointerController(

                policy, looper, spriteController,

                [](const sp<android::gui::WindowInfosListener>& listener) {

                    auto initialInfo = std::make_pair(std::vector<android::gui::WindowInfo>{},

                                                      std::vector<android::gui::DisplayInfo>{});

                    gui::WindowInfosUpdate initialInfo;

                    SurfaceComposerClient::getDefault()->addWindowInfosListener(listener,

                                                                                &initialInfo);

                    return initialInfo.second;

                    return initialInfo.displayInfos;

                },

                [](const sp<android::gui::WindowInfosListener>& listener) {

                    SurfaceComposerClient::getDefault()->removeWindowInfosListener(listener);