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

Commit fef966ae authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix another merge problem. 

Change-Id: I3a65f3f588dd84bf163502e9c7ab99c8a22bae26
parent 161e67ff

core/jni/android_content_res_Configuration.cpp

+3 −3
Original line number Diff line number Diff line
@@ -116,11 +116,11 @@ int register_android_content_res_Configuration(JNIEnv* env) 
            "orientation", "I");

    GET_FIELD_ID(gConfigurationClassInfo.uiMode, clazz,

            "uiMode", "I");

    GET_FIELD_ID(gConfigurationClassInfo.screenWidthDp, gConfigurationClassInfo.clazz,

    GET_FIELD_ID(gConfigurationClassInfo.screenWidthDp, clazz,

            "screenWidthDp", "I");

    GET_FIELD_ID(gConfigurationClassInfo.screenHeightDp, gConfigurationClassInfo.clazz,

    GET_FIELD_ID(gConfigurationClassInfo.screenHeightDp, clazz,

            "screenHeightDp", "I");

    GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp, gConfigurationClassInfo.clazz,

    GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp, clazz,

            "smallestScreenWidthDp", "I");



    return AndroidRuntime::registerNativeMethods(env, "android/content/res/Configuration", gMethods,