Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sync with bootFinished migration to AIDL"

Browse Source
This commit is contained in:
Huihong Luo
2022-04-20 22:55:09 +00:00
committed by Android (Google) Code Review
parent 728192148c 9a0eb6b724
commit 65d494644b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android_view_DisplayEventReceiver.cpp
View File

@@ -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);

5
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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();