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

Commit a8ce8fc1 authored by Ken Chen's avatar Ken Chen Committed by Android (Google) Code Review
Browse files

Revert "Improve updateInputFlinger performance" 

This reverts commit 82f3463d.

Reason for revert: Broken Build 10741338 on git_udc-mainline-prod on mainline_modules_arm-userdebug 
Bug: 298282482

Change-Id: I9a8eaaff637017cd84caaa5c0d570e24f257ed81
parent 82f3463d

libs/gui/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -73,7 +73,6 @@ filegroup { 
        "android/gui/FocusRequest.aidl",

        "android/gui/FocusRequest.aidl",

        "android/gui/InputApplicationInfo.aidl",

        "android/gui/InputApplicationInfo.aidl",

        "android/gui/IWindowInfosListener.aidl",

        "android/gui/IWindowInfosListener.aidl",

        "android/gui/IWindowInfosPublisher.aidl",

        "android/gui/IWindowInfosReportedListener.aidl",

        "android/gui/IWindowInfosReportedListener.aidl",

        "android/gui/WindowInfo.aidl",

        "android/gui/WindowInfo.aidl",

        "android/gui/WindowInfosUpdate.aidl",

        "android/gui/WindowInfosUpdate.aidl",
@@ -91,7 +90,6 @@ cc_library_static { 
        "android/gui/FocusRequest.aidl",

        "android/gui/FocusRequest.aidl",

        "android/gui/InputApplicationInfo.aidl",

        "android/gui/InputApplicationInfo.aidl",

        "android/gui/IWindowInfosListener.aidl",

        "android/gui/IWindowInfosListener.aidl",

        "android/gui/IWindowInfosPublisher.aidl",

        "android/gui/IWindowInfosReportedListener.aidl",

        "android/gui/IWindowInfosReportedListener.aidl",

        "android/gui/WindowInfosUpdate.aidl",

        "android/gui/WindowInfosUpdate.aidl",

        "android/gui/WindowInfo.aidl",

        "android/gui/WindowInfo.aidl",

libs/gui/WindowInfosListenerReporter.cpp

+8 −12
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
namespace android {

namespace android {





using gui::DisplayInfo;

using gui::DisplayInfo;

using gui::IWindowInfosReportedListener;

using gui::WindowInfo;

using gui::WindowInfo;

using gui::WindowInfosListener;

using gui::WindowInfosListener;

using gui::aidl_utils::statusTFromBinderStatus;

using gui::aidl_utils::statusTFromBinderStatus;
@@ -39,13 +40,8 @@ status_t WindowInfosListenerReporter::addWindowInfosListener( 
    {

    {

        std::scoped_lock lock(mListenersMutex);

        std::scoped_lock lock(mListenersMutex);

        if (mWindowInfosListeners.empty()) {

        if (mWindowInfosListeners.empty()) {

            gui::WindowInfosListenerInfo listenerInfo;

            binder::Status s = surfaceComposer->addWindowInfosListener(this);

            binder::Status s = surfaceComposer->addWindowInfosListener(this, &listenerInfo);

            status = statusTFromBinderStatus(s);

            status = statusTFromBinderStatus(s);

            if (status == OK) {

                mWindowInfosPublisher = std::move(listenerInfo.windowInfosPublisher);

                mListenerId = listenerInfo.listenerId;

            }

        }

        }





        if (status == OK) {

        if (status == OK) {
@@ -89,7 +85,8 @@ status_t WindowInfosListenerReporter::removeWindowInfosListener( 
}

}





binder::Status WindowInfosListenerReporter::onWindowInfosChanged(

binder::Status WindowInfosListenerReporter::onWindowInfosChanged(

        const gui::WindowInfosUpdate& update) {

        const gui::WindowInfosUpdate& update,

        const sp<IWindowInfosReportedListener>& windowInfosReportedListener) {

    std::unordered_set<sp<WindowInfosListener>, gui::SpHash<WindowInfosListener>>

    std::unordered_set<sp<WindowInfosListener>, gui::SpHash<WindowInfosListener>>

            windowInfosListeners;

            windowInfosListeners;
@@ -107,7 +104,9 @@ binder::Status WindowInfosListenerReporter::onWindowInfosChanged( 
        listener->onWindowInfosChanged(update);

        listener->onWindowInfosChanged(update);

    }

    }





    mWindowInfosPublisher->ackWindowInfosReceived(update.vsyncId, mListenerId);

    if (windowInfosReportedListener) {

        windowInfosReportedListener->onWindowInfosReported();

    }





    return binder::Status::ok();

    return binder::Status::ok();

}

}
@@ -115,10 +114,7 @@ binder::Status WindowInfosListenerReporter::onWindowInfosChanged( 
void WindowInfosListenerReporter::reconnect(const sp<gui::ISurfaceComposer>& composerService) {

void WindowInfosListenerReporter::reconnect(const sp<gui::ISurfaceComposer>& composerService) {

    std::scoped_lock lock(mListenersMutex);

    std::scoped_lock lock(mListenersMutex);

    if (!mWindowInfosListeners.empty()) {

    if (!mWindowInfosListeners.empty()) {

        gui::WindowInfosListenerInfo listenerInfo;

        composerService->addWindowInfosListener(this);

        composerService->addWindowInfosListener(this, &listenerInfo);

        mWindowInfosPublisher = std::move(listenerInfo.windowInfosPublisher);

        mListenerId = listenerInfo.listenerId;

    }

    }

}

}

libs/gui/aidl/android/gui/ISurfaceComposer.aidl

+1 −3
Original line number Original line Diff line number Diff line
@@ -40,14 +40,12 @@ import android.gui.IScreenCaptureListener; 
import android.gui.ISurfaceComposerClient;

import android.gui.ISurfaceComposerClient;

import android.gui.ITunnelModeEnabledListener;

import android.gui.ITunnelModeEnabledListener;

import android.gui.IWindowInfosListener;

import android.gui.IWindowInfosListener;

import android.gui.IWindowInfosPublisher;

import android.gui.LayerCaptureArgs;

import android.gui.LayerCaptureArgs;

import android.gui.LayerDebugInfo;

import android.gui.LayerDebugInfo;

import android.gui.OverlayProperties;

import android.gui.OverlayProperties;

import android.gui.PullAtomData;

import android.gui.PullAtomData;

import android.gui.ARect;

import android.gui.ARect;

import android.gui.StaticDisplayInfo;

import android.gui.StaticDisplayInfo;

import android.gui.WindowInfosListenerInfo;





/** @hide */

/** @hide */

interface ISurfaceComposer {

interface ISurfaceComposer {
@@ -502,7 +500,7 @@ interface ISurfaceComposer { 
     */

     */

    int getMaxAcquiredBufferCount();

    int getMaxAcquiredBufferCount();





    WindowInfosListenerInfo addWindowInfosListener(IWindowInfosListener windowInfosListener);

    void addWindowInfosListener(IWindowInfosListener windowInfosListener);





    void removeWindowInfosListener(IWindowInfosListener windowInfosListener);

    void removeWindowInfosListener(IWindowInfosListener windowInfosListener);

libs/gui/aidl/android/gui/WindowInfosListenerInfo.aidl

deleted100644 → 0
+0 −25
Original line number Original line Diff line number Diff line 
/**

 * Copyright (c) 2023, 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.

 */



package android.gui;



import android.gui.IWindowInfosPublisher;



/** @hide */

parcelable WindowInfosListenerInfo {

    long listenerId;

    IWindowInfosPublisher windowInfosPublisher;

}
 
 No newline at end of file

libs/gui/android/gui/IWindowInfosListener.aidl

+3 −1
Original line number Original line Diff line number Diff line
@@ -16,9 +16,11 @@ 




package android.gui;

package android.gui;





import android.gui.IWindowInfosReportedListener;

import android.gui.WindowInfosUpdate;

import android.gui.WindowInfosUpdate;





/** @hide */

/** @hide */

oneway interface IWindowInfosListener {

oneway interface IWindowInfosListener {

    void onWindowInfosChanged(in WindowInfosUpdate update);

    void onWindowInfosChanged(

        in WindowInfosUpdate update, in @nullable IWindowInfosReportedListener windowInfosReportedListener);

}
 
}