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

Commit 65d49464 authored by Huihong Luo's avatar Huihong Luo Committed by Android (Google) Code Review
Browse files

Merge "Sync with bootFinished migration to AIDL"

parents 72819214 9a0eb6b7

core/jni/android_view_DisplayEventReceiver.cpp

+3 −2
Original line number Diff line number Diff line
@@ -90,8 +90,9 @@ NativeDisplayEventReceiver::NativeDisplayEventReceiver(JNIEnv* env, jobject rece 
                                                       const sp<MessageQueue>& messageQueue,

                                                       jint vsyncSource, jint eventRegistration)

      : DisplayEventDispatcher(messageQueue->getLooper(),

                               static_cast<ISurfaceComposer::VsyncSource>(vsyncSource),

                               static_cast<ISurfaceComposer::EventRegistration>(eventRegistration)),

                               static_cast<gui::ISurfaceComposer::VsyncSource>(vsyncSource),

                               static_cast<gui::ISurfaceComposer::EventRegistration>(

                                       eventRegistration)),

        mReceiverWeakGlobal(env->NewGlobalRef(receiverWeak)),

        mMessageQueue(messageQueue) {

    ALOGV("receiver %p ~ Initializing display event receiver.", this);

services/core/java/com/android/server/wm/WindowManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -3693,11 +3693,12 @@ public class WindowManagerService extends IWindowManager.Stub 
            }



            try {

                IBinder surfaceFlinger = ServiceManager.getService("SurfaceFlinger");

                // TODO(b/221898546): remove the following and convert to jni

                IBinder surfaceFlinger = ServiceManager.getService("SurfaceFlingerAIDL");

                if (surfaceFlinger != null) {

                    ProtoLog.i(WM_ERROR, "******* TELLING SURFACE FLINGER WE ARE BOOTED!");

                    Parcel data = Parcel.obtain();

                    data.writeInterfaceToken("android.ui.ISurfaceComposer");

                    data.writeInterfaceToken("android.gui.ISurfaceComposer");

                    surfaceFlinger.transact(IBinder.FIRST_CALL_TRANSACTION, // BOOT_FINISHED

                            data, null, 0);

                    data.recycle();