Tracking changes to renaming DisplayConfig to DisplayMode (cb783ca6) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+12 −10

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@

		#include <android-base/properties.h>

		#include <ui/DisplayConfig.h>
		#include <ui/DisplayMode.h>
		#include <ui/PixelFormat.h>
		#include <ui/Rect.h>
		#include <ui/Region.h>
		@@ -65,6 +65,8 @@

		namespace android {

		using ui::DisplayMode;

		static const char OEM_BOOTANIMATION_FILE[] = "/oem/media/bootanimation.zip";
		static const char PRODUCT_BOOTANIMATION_DARK_FILE[] = "/product/media/bootanimation-dark.zip";
		static const char PRODUCT_BOOTANIMATION_FILE[] = "/product/media/bootanimation.zip";
		@@ -345,14 +347,14 @@ public:
		continue;
		}

		DisplayConfig displayConfig;
		const status_t error = SurfaceComposerClient::getActiveDisplayConfig(
		mBootAnimation->mDisplayToken, &displayConfig);
		DisplayMode displayMode;
		const status_t error = SurfaceComposerClient::getActiveDisplayMode(
		mBootAnimation->mDisplayToken, &displayMode);
		if (error != NO_ERROR) {
		SLOGE("Can't get active display configuration.");
		SLOGE("Can't get active display mode.");
		}
		mBootAnimation->resizeSurface(displayConfig.resolution.getWidth(),
		displayConfig.resolution.getHeight());
		mBootAnimation->resizeSurface(displayMode.resolution.getWidth(),
		displayMode.resolution.getHeight());
		}
		}
		} while (numEvents > 0);
		@@ -401,15 +403,15 @@ status_t BootAnimation::readyToRun() {
		if (mDisplayToken == nullptr)
		return NAME_NOT_FOUND;

		DisplayConfig displayConfig;
		DisplayMode displayMode;
		const status_t error =
		SurfaceComposerClient::getActiveDisplayConfig(mDisplayToken, &displayConfig);
		SurfaceComposerClient::getActiveDisplayMode(mDisplayToken, &displayMode);
		if (error != NO_ERROR)
		return error;

		mMaxWidth = android::base::GetIntProperty("ro.surface_flinger.max_graphics_width", 0);
		mMaxHeight = android::base::GetIntProperty("ro.surface_flinger.max_graphics_height", 0);
		ui::Size resolution = displayConfig.resolution;
		ui::Size resolution = displayMode.resolution;
		resolution = limitSurfaceSize(resolution.width, resolution.height);
		// create the native surface
		sp<SurfaceControl> control = session()->createSurface(String8("BootAnimation"),

core/java/android/view/DisplayEventReceiver.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -58,11 +58,11 @@ public abstract class DisplayEventReceiver {
		public static final int VSYNC_SOURCE_SURFACE_FLINGER = 1;

		/**
		* Specifies to generate config changed events from Surface Flinger.
		* Specifies to generate mode changed events from Surface Flinger.
		* <p>
		* Needs to be kept in sync with frameworks/native/include/gui/ISurfaceComposer.h
		*/
		public static final int EVENT_REGISTRATION_CONFIG_CHANGED_FLAG = 0x1;
		public static final int EVENT_REGISTRATION_MODE_CHANGED_FLAG = 0x1;

		/**
		* Specifies to generate frame rate override events from Surface Flinger.
		@@ -197,14 +197,14 @@ public abstract class DisplayEventReceiver {
		}

		/**
		* Called when a display config changed event is received.
		* Called when a display mode changed event is received.
		*
		* @param timestampNanos The timestamp of the event, in the {@link System#nanoTime()}
		* timebase.
		* @param physicalDisplayId Stable display ID that uniquely describes a (display, port) pair.
		* @param configId The new config Id
		* @param modeId The new mode Id
		*/
		public void onConfigChanged(long timestampNanos, long physicalDisplayId, int configId) {
		public void onModeChanged(long timestampNanos, long physicalDisplayId, int modeId) {
		}

		/**
		@@ -273,8 +273,8 @@ public abstract class DisplayEventReceiver {

		// Called from native code.
		@SuppressWarnings("unused")
		private void dispatchConfigChanged(long timestampNanos, long physicalDisplayId, int configId) {
		onConfigChanged(timestampNanos, physicalDisplayId, configId);
		private void dispatchModeChanged(long timestampNanos, long physicalDisplayId, int modeId) {
		onModeChanged(timestampNanos, physicalDisplayId, modeId);
		}

		// Called from native code.

core/java/android/view/SurfaceControl.java

+40 −34

Original line number	Diff line number	Diff line
		@@ -161,8 +161,8 @@ public final class SurfaceControl implements Parcelable {
		int L, int T, int R, int B);
		private static native void nativeSetDisplaySize(long transactionObj, IBinder displayToken,
		int width, int height);
		private static native SurfaceControl.DisplayInfo nativeGetDisplayInfo(IBinder displayToken);
		private static native SurfaceControl.DisplayConfig[] nativeGetDisplayConfigs(
		private static native DisplayInfo nativeGetDisplayInfo(IBinder displayToken);
		private static native DisplayMode[] nativeGetDisplayModes(
		IBinder displayToken);
		private static native DisplayedContentSamplingAttributes
		nativeGetDisplayedContentSamplingAttributes(IBinder displayToken);
		@@ -170,13 +170,13 @@ public final class SurfaceControl implements Parcelable {
		boolean enable, int componentMask, int maxFrames);
		private static native DisplayedContentSample nativeGetDisplayedContentSample(
		IBinder displayToken, long numFrames, long timestamp);
		private static native int nativeGetActiveConfig(IBinder displayToken);
		private static native boolean nativeSetDesiredDisplayConfigSpecs(IBinder displayToken,
		SurfaceControl.DesiredDisplayConfigSpecs desiredDisplayConfigSpecs);
		private static native SurfaceControl.DesiredDisplayConfigSpecs
		nativeGetDesiredDisplayConfigSpecs(IBinder displayToken);
		private static native int nativeGetActiveDisplayMode(IBinder displayToken);
		private static native boolean nativeSetDesiredDisplayModeSpecs(IBinder displayToken,
		DesiredDisplayModeSpecs desiredDisplayModeSpecs);
		private static native DesiredDisplayModeSpecs
		nativeGetDesiredDisplayModeSpecs(IBinder displayToken);
		private static native int[] nativeGetDisplayColorModes(IBinder displayToken);
		private static native SurfaceControl.DisplayPrimaries nativeGetDisplayNativePrimaries(
		private static native DisplayPrimaries nativeGetDisplayNativePrimaries(
		IBinder displayToken);
		private static native int[] nativeGetCompositionDataspaces();
		private static native int nativeGetActiveColorMode(IBinder displayToken);
		@@ -1745,11 +1745,11 @@ public final class SurfaceControl implements Parcelable {
		*
		* @hide
		*/
		public static final class DisplayConfig {
		public static final class DisplayMode {
		/**
		* Invalid display config id.
		*/
		public static final int INVALID_DISPLAY_CONFIG_ID = -1;
		public static final int INVALID_DISPLAY_MODE_ID = -1;

		public int width;
		public int height;
		@@ -1766,7 +1766,7 @@ public final class SurfaceControl implements Parcelable {
		* configs within the same group can be done seamlessly in most cases.
		* @see: android.hardware.graphics.composer@2.4::IComposerClient::Attribute::CONFIG_GROUP
		*/
		public int configGroup;
		public int group;

		@Override
		public String toString() {
		@@ -1777,7 +1777,7 @@ public final class SurfaceControl implements Parcelable {
		+ ", refreshRate=" + refreshRate
		+ ", appVsyncOffsetNanos=" + appVsyncOffsetNanos
		+ ", presentationDeadlineNanos=" + presentationDeadlineNanos
		+ ", configGroup=" + configGroup + "}";
		+ ", group=" + group + "}";
		}
		}

		@@ -1804,21 +1804,21 @@ public final class SurfaceControl implements Parcelable {
		/**
		* @hide
		*/
		public static SurfaceControl.DisplayConfig[] getDisplayConfigs(IBinder displayToken) {
		public static DisplayMode[] getDisplayModes(IBinder displayToken) {
		if (displayToken == null) {
		throw new IllegalArgumentException("displayToken must not be null");
		}
		return nativeGetDisplayConfigs(displayToken);
		return nativeGetDisplayModes(displayToken);
		}

		/**
		* @hide
		*/
		public static int getActiveConfig(IBinder displayToken) {
		public static int getActiveDisplayMode(IBinder displayToken) {
		if (displayToken == null) {
		throw new IllegalArgumentException("displayToken must not be null");
		}
		return nativeGetActiveConfig(displayToken);
		return nativeGetActiveDisplayMode(displayToken);
		}

		/**
		@@ -1865,8 +1865,8 @@ public final class SurfaceControl implements Parcelable {
		*
		* @hide
		*/
		public static final class DesiredDisplayConfigSpecs {
		public int defaultConfig;
		public static final class DesiredDisplayModeSpecs {
		public int defaultMode;
		/**
		* The primary refresh rate range represents display manager's general guidance on the
		* display configs surface flinger will consider when switching refresh rates. Unless
		@@ -1891,16 +1891,16 @@ public final class SurfaceControl implements Parcelable {
		*/
		public boolean allowGroupSwitching;

		public DesiredDisplayConfigSpecs() {}
		public DesiredDisplayModeSpecs() {}

		public DesiredDisplayConfigSpecs(DesiredDisplayConfigSpecs other) {
		public DesiredDisplayModeSpecs(DesiredDisplayModeSpecs other) {
		copyFrom(other);
		}

		public DesiredDisplayConfigSpecs(int defaultConfig, boolean allowGroupSwitching,
		public DesiredDisplayModeSpecs(int defaultMode, boolean allowGroupSwitching,
		float primaryRefreshRateMin, float primaryRefreshRateMax,
		float appRequestRefreshRateMin, float appRequestRefreshRateMax) {
		this.defaultConfig = defaultConfig;
		this.defaultMode = defaultMode;
		this.allowGroupSwitching = allowGroupSwitching;
		this.primaryRefreshRateMin = primaryRefreshRateMin;
		this.primaryRefreshRateMax = primaryRefreshRateMax;
		@@ -1910,14 +1910,14 @@ public final class SurfaceControl implements Parcelable {

		@Override
		public boolean equals(@Nullable Object o) {
		return o instanceof DesiredDisplayConfigSpecs && equals((DesiredDisplayConfigSpecs) o);
		return o instanceof DesiredDisplayModeSpecs && equals((DesiredDisplayModeSpecs) o);
		}

		/**
		* Tests for equality.
		*/
		public boolean equals(DesiredDisplayConfigSpecs other) {
		return other != null && defaultConfig == other.defaultConfig
		public boolean equals(DesiredDisplayModeSpecs other) {
		return other != null && defaultMode == other.defaultMode
		&& primaryRefreshRateMin == other.primaryRefreshRateMin
		&& primaryRefreshRateMax == other.primaryRefreshRateMax
		&& appRequestRefreshRateMin == other.appRequestRefreshRateMin
		@@ -1932,8 +1932,8 @@ public final class SurfaceControl implements Parcelable {
		/**
		* Copies the supplied object's values to this object.
		*/
		public void copyFrom(DesiredDisplayConfigSpecs other) {
		defaultConfig = other.defaultConfig;
		public void copyFrom(DesiredDisplayModeSpecs other) {
		defaultMode = other.defaultMode;
		primaryRefreshRateMin = other.primaryRefreshRateMin;
		primaryRefreshRateMax = other.primaryRefreshRateMax;
		appRequestRefreshRateMin = other.appRequestRefreshRateMin;
		@@ -1944,7 +1944,7 @@ public final class SurfaceControl implements Parcelable {
		public String toString() {
		return String.format("defaultConfig=%d primaryRefreshRateRange=[%.0f %.0f]"
		+ " appRequestRefreshRateRange=[%.0f %.0f]",
		defaultConfig, primaryRefreshRateMin, primaryRefreshRateMax,
		defaultMode, primaryRefreshRateMin, primaryRefreshRateMax,
		appRequestRefreshRateMin, appRequestRefreshRateMax);
		}
		}
		@@ -1952,25 +1952,31 @@ public final class SurfaceControl implements Parcelable {
		/**
		* @hide
		*/
		public static boolean setDesiredDisplayConfigSpecs(IBinder displayToken,
		SurfaceControl.DesiredDisplayConfigSpecs desiredDisplayConfigSpecs) {
		public static boolean setDesiredDisplayModeSpecs(IBinder displayToken,
		DesiredDisplayModeSpecs desiredDisplayModeSpecs) {
		if (displayToken == null) {
		throw new IllegalArgumentException("displayToken must not be null");
		}
		if (desiredDisplayModeSpecs == null) {
		throw new IllegalArgumentException("desiredDisplayModeSpecs must not be null");
		}
		if (desiredDisplayModeSpecs.defaultMode < 0) {
		throw new IllegalArgumentException("defaultMode must be non-negative");
		}

		return nativeSetDesiredDisplayConfigSpecs(displayToken, desiredDisplayConfigSpecs);
		return nativeSetDesiredDisplayModeSpecs(displayToken, desiredDisplayModeSpecs);
		}

		/**
		* @hide
		*/
		public static SurfaceControl.DesiredDisplayConfigSpecs getDesiredDisplayConfigSpecs(
		public static DesiredDisplayModeSpecs getDesiredDisplayModeSpecs(
		IBinder displayToken) {
		if (displayToken == null) {
		throw new IllegalArgumentException("displayToken must not be null");
		}

		return nativeGetDesiredDisplayConfigSpecs(displayToken);
		return nativeGetDesiredDisplayModeSpecs(displayToken);
		}

		/**
		@@ -2041,7 +2047,7 @@ public final class SurfaceControl implements Parcelable {
		/**
		* @hide
		*/
		public static SurfaceControl.DisplayPrimaries getDisplayNativePrimaries(
		public static DisplayPrimaries getDisplayNativePrimaries(
		IBinder displayToken) {
		if (displayToken == null) {
		throw new IllegalArgumentException("displayToken must not be null");

core/jni/android_view_DisplayEventReceiver.cpp

+18 −18

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ static struct {

		jmethodID dispatchVsync;
		jmethodID dispatchHotplug;
		jmethodID dispatchConfigChanged;
		jmethodID dispatchModeChanged;
		jmethodID dispatchFrameRateOverrides;

		struct {
		@@ -69,8 +69,8 @@ private:
		void dispatchVsync(nsecs_t timestamp, PhysicalDisplayId displayId, uint32_t count,
		VsyncEventData vsyncEventData) override;
		void dispatchHotplug(nsecs_t timestamp, PhysicalDisplayId displayId, bool connected) override;
		void dispatchConfigChanged(nsecs_t timestamp, PhysicalDisplayId displayId,
		int32_t configId, nsecs_t vsyncPeriod) override;
		void dispatchModeChanged(nsecs_t timestamp, PhysicalDisplayId displayId, int32_t modeId,
		nsecs_t vsyncPeriod) override;
		void dispatchFrameRateOverrides(nsecs_t timestamp, PhysicalDisplayId displayId,
		std::vector<FrameRateOverride> overrides) override;
		void dispatchNullEvent(nsecs_t timestamp, PhysicalDisplayId displayId) override {}
		@@ -129,20 +129,19 @@ void NativeDisplayEventReceiver::dispatchHotplug(nsecs_t timestamp, PhysicalDisp
		mMessageQueue->raiseAndClearException(env, "dispatchHotplug");
		}

		void NativeDisplayEventReceiver::dispatchConfigChanged(
		nsecs_t timestamp, PhysicalDisplayId displayId, int32_t configId, nsecs_t) {
		void NativeDisplayEventReceiver::dispatchModeChanged(nsecs_t timestamp, PhysicalDisplayId displayId,
		int32_t modeId, 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(), gDisplayEventReceiverClassInfo.dispatchConfigChanged,
		timestamp, displayId.value, configId);
		ALOGV("receiver %p ~ Returned from config changed handler.", this);
		ALOGV("receiver %p ~ Invoking mode changed handler.", this);
		env->CallVoidMethod(receiverObj.get(), gDisplayEventReceiverClassInfo.dispatchModeChanged,
		timestamp, displayId.value, modeId);
		ALOGV("receiver %p ~ Returned from mode changed handler.", this);
		}

		mMessageQueue->raiseAndClearException(env, "dispatchConfigChanged");
		mMessageQueue->raiseAndClearException(env, "dispatchModeChanged");
		}

		void NativeDisplayEventReceiver::dispatchFrameRateOverrides(
		@@ -173,7 +172,7 @@ void NativeDisplayEventReceiver::dispatchFrameRateOverrides(
		ALOGV("receiver %p ~ Returned from FrameRateOverride handler.", this);
		}

		mMessageQueue->raiseAndClearException(env, "dispatchConfigChanged");
		mMessageQueue->raiseAndClearException(env, "dispatchModeChanged");
		}

		static jlong nativeInit(JNIEnv* env, jclass clazz, jobject receiverWeak, jobject messageQueueObj,
		@@ -243,8 +242,9 @@ int register_android_view_DisplayEventReceiver(JNIEnv* env) {
		"(JJIJJ)V");
		gDisplayEventReceiverClassInfo.dispatchHotplug = GetMethodIDOrDie(env,
		gDisplayEventReceiverClassInfo.clazz, "dispatchHotplug", "(JJZ)V");
		gDisplayEventReceiverClassInfo.dispatchConfigChanged = GetMethodIDOrDie(env,
		gDisplayEventReceiverClassInfo.clazz, "dispatchConfigChanged", "(JJI)V");
		gDisplayEventReceiverClassInfo.dispatchModeChanged =
		GetMethodIDOrDie(env, gDisplayEventReceiverClassInfo.clazz, "dispatchModeChanged",
		"(JJI)V");
		gDisplayEventReceiverClassInfo.dispatchFrameRateOverrides =
		GetMethodIDOrDie(env, gDisplayEventReceiverClassInfo.clazz,
		"dispatchFrameRateOverrides",