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

Commit be414332 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Fix android.text.format.Time to use GetBooleanField on its boolean field. 

Bug: 5162851
Change-Id: I49b1429e86ffa91fbfb8b4c9d1a0c6d30c72621e
parent 99f09c27

core/jni/android_text_format_Time.cpp

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static inline bool java2time(JNIEnv* env, Time* t, jobject o) 
    t->t.tm_yday = env->GetIntField(o, g_ydayField);

    t->t.tm_isdst = env->GetIntField(o, g_isdstField);

    t->t.tm_gmtoff = env->GetLongField(o, g_gmtoffField);

    bool allDay = env->GetIntField(o, g_allDayField);

    bool allDay = env->GetBooleanField(o, g_allDayField);

    if (allDay &&

	((t->t.tm_sec !=0) || (t->t.tm_min != 0) || (t->t.tm_hour != 0))) {

        char msg[100];
@@ -162,7 +162,7 @@ static jstring android_text_format_Time_format2445(JNIEnv* env, jobject This) 
{

    Time t;

    if (!java2time(env, &t, This)) return env->NewStringUTF("");

    bool allDay = env->GetIntField(This, g_allDayField);

    bool allDay = env->GetBooleanField(This, g_allDayField);

    

    if (!allDay) {

        ACQUIRE_TIMEZONE(This, t)