Merge "[AChoreographer] Update frameworks/base with refresh rate callbacks"

This commit is contained in:
TreeHugger Robot
2020-01-06 23:19:18 +00:00
committed by Android (Google) Code Review

View File

@@ -62,7 +62,7 @@ private:
void dispatchVsync(nsecs_t timestamp, PhysicalDisplayId displayId, uint32_t count) override;
void dispatchHotplug(nsecs_t timestamp, PhysicalDisplayId displayId, bool connected) override;
void dispatchConfigChanged(nsecs_t timestamp, PhysicalDisplayId displayId,
int32_t configId) override;
int32_t configId, nsecs_t vsyncPeriod) override;
};
@@ -118,24 +118,23 @@ void NativeDisplayEventReceiver::dispatchHotplug(nsecs_t timestamp, PhysicalDisp
mMessageQueue->raiseAndClearException(env, "dispatchHotplug");
}
void NativeDisplayEventReceiver::dispatchConfigChanged(nsecs_t timestamp,
PhysicalDisplayId displayId,
int32_t configId) {
JNIEnv* env = AndroidRuntime::getJNIEnv();
void NativeDisplayEventReceiver::dispatchConfigChanged(
nsecs_t timestamp, PhysicalDisplayId displayId, int32_t configId, nsecs_t) {
JNIEnv* env = AndroidRuntime::getJNIEnv();
ScopedLocalRef<jobject> receiverObj(env, jniGetReferent(env, mReceiverWeakGlobal));
if (receiverObj.get()) {
ALOGV("receiver %p ~ Invoking config changed handler.", this);
env->CallVoidMethod(receiverObj.get(),
gDisplayEventReceiverClassInfo.dispatchConfigChanged,
timestamp, displayId, configId);
ALOGV("receiver %p ~ Returned from config changed handler.", this);
}
ScopedLocalRef<jobject> receiverObj(env,
jniGetReferent(env, mReceiverWeakGlobal));
if (receiverObj.get()) {
ALOGV("receiver %p ~ Invoking config changed handler.", this);
env->CallVoidMethod(receiverObj.get(),
gDisplayEventReceiverClassInfo.dispatchConfigChanged,
timestamp, displayId, configId);
ALOGV("receiver %p ~ Returned from config changed handler.", this);
}
mMessageQueue->raiseAndClearException(env, "dispatchConfigChanged");
mMessageQueue->raiseAndClearException(env, "dispatchConfigChanged");
}
static jlong nativeInit(JNIEnv* env, jclass clazz, jobject receiverWeak,
jobject messageQueueObj, jint vsyncSource, jint configChanged) {
sp<MessageQueue> messageQueue = android_os_MessageQueue_getMessageQueue(env, messageQueueObj);