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

Commit b88549e5 authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Rename GraphicsTypes.h to GraphicTypes.h 

Renamed GraphicsTypes.h to GraphicTypes.h for nameing convention
consistency, updated namespace for ColorMode.

BUG: 77156734
Test: Build and flash
Change-Id: Ic49f6214adc63e9c0e269ba5ce0d0250e6feba2b
Merged-In: Ic49f6214adc63e9c0e269ba5ce0d0250e6feba2b
parent 64faa5b6

core/jni/android_view_SurfaceControl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <system/graphics.h>

#include <ui/DisplayInfo.h>

#include <ui/FrameStats.h>

#include <ui/GraphicsTypes.h>

#include <ui/GraphicTypes.h>

#include <ui/HdrCapabilities.h>

#include <ui/Rect.h>

#include <ui/Region.h>
@@ -598,7 +598,7 @@ static jboolean nativeSetActiveConfig(JNIEnv* env, jclass clazz, jobject tokenOb 
static jintArray nativeGetDisplayColorModes(JNIEnv* env, jclass, jobject tokenObj) {

    sp<IBinder> token(ibinderForJavaObject(env, tokenObj));

    if (token == NULL) return NULL;

    Vector<ColorMode> colorModes;

    Vector<ui::ColorMode> colorModes;

    if (SurfaceComposerClient::getDisplayColorModes(token, &colorModes) != NO_ERROR ||

            colorModes.isEmpty()) {

        return NULL;
@@ -628,7 +628,7 @@ static jboolean nativeSetActiveColorMode(JNIEnv* env, jclass, 
    sp<IBinder> token(ibinderForJavaObject(env, tokenObj));

    if (token == NULL) return JNI_FALSE;

    status_t err = SurfaceComposerClient::setActiveColorMode(token,

            static_cast<ColorMode>(colorMode));

            static_cast<ui::ColorMode>(colorMode));

    return err == NO_ERROR ? JNI_TRUE : JNI_FALSE;

}