Merge "[AChoreographer] Update frameworks/base with refresh rate callbacks" (d9b1ac97) · Commits · e / os / android_frameworks_base

core/jni/android_view_DisplayEventReceiver.cpp

+16 −17

Original line number	Diff line number	Diff line
		@@ -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,12 +118,12 @@ void NativeDisplayEventReceiver::dispatchHotplug(nsecs_t timestamp, PhysicalDisp
		mMessageQueue->raiseAndClearException(env, "dispatchHotplug");
		}

		void NativeDisplayEventReceiver::dispatchConfigChanged(nsecs_t timestamp,
		PhysicalDisplayId displayId,
		int32_t configId) {
		void NativeDisplayEventReceiver::dispatchConfigChanged(
		nsecs_t timestamp, PhysicalDisplayId displayId, int32_t configId, nsecs_t) {
		JNIEnv* env = AndroidRuntime::getJNIEnv();

		ScopedLocalRef<jobject> receiverObj(env, jniGetReferent(env, mReceiverWeakGlobal));
		ScopedLocalRef<jobject> receiverObj(env,
		jniGetReferent(env, mReceiverWeakGlobal));
		if (receiverObj.get()) {
		ALOGV("receiver %p ~ Invoking config changed handler.", this);
		env->CallVoidMethod(receiverObj.get(),
		@@ -135,7 +135,6 @@ void NativeDisplayEventReceiver::dispatchConfigChanged(nsecs_t timestamp,
		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);