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

Commit dac92e6f authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 3e584fc9: Merge change I5975651f into eclair 

Merge commit '3e584fc9' into eclair-mr2

* commit '3e584fc9':
  Don't feed the timezone to RenderScript time functions, let the library figure it out.
parents ad99c287 3e584fc9

libs/rs/rsScriptC_Lib.cpp

+18 −55
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <GLES/glext.h>



#include <time.h>

#include <cutils/tztime.h>



using namespace android;

using namespace android::renderscript;
@@ -444,16 +443,10 @@ static int32_t SC_second() 
    time_t rawtime;

    time(&rawtime);



    if (sc->mEnviroment.mTimeZone) {

        struct tm timeinfo;

        localtime_tz(&rawtime, &timeinfo, sc->mEnviroment.mTimeZone);

        return timeinfo.tm_sec;

    } else {

    struct tm *timeinfo;

    timeinfo = localtime(&rawtime);

    return timeinfo->tm_sec;

}

}



static int32_t SC_minute()

{
@@ -462,16 +455,10 @@ static int32_t SC_minute() 
    time_t rawtime;

    time(&rawtime);



    if (sc->mEnviroment.mTimeZone) {

        struct tm timeinfo;

        localtime_tz(&rawtime, &timeinfo, sc->mEnviroment.mTimeZone);

        return timeinfo.tm_min;

    } else {

    struct tm *timeinfo;

    timeinfo = localtime(&rawtime);

    return timeinfo->tm_min;

}

}



static int32_t SC_hour()

{
@@ -480,16 +467,10 @@ static int32_t SC_hour() 
    time_t rawtime;

    time(&rawtime);



    if (sc->mEnviroment.mTimeZone) {

        struct tm timeinfo;

        localtime_tz(&rawtime, &timeinfo, sc->mEnviroment.mTimeZone);

        return timeinfo.tm_hour;

    } else {

    struct tm *timeinfo;

    timeinfo = localtime(&rawtime);

    return timeinfo->tm_hour;

}

}



static int32_t SC_day()

{
@@ -498,16 +479,10 @@ static int32_t SC_day() 
    time_t rawtime;

    time(&rawtime);



    if (sc->mEnviroment.mTimeZone) {

        struct tm timeinfo;

        localtime_tz(&rawtime, &timeinfo, sc->mEnviroment.mTimeZone);

        return timeinfo.tm_mday;

    } else {

    struct tm *timeinfo;

    timeinfo = localtime(&rawtime);

    return timeinfo->tm_mday;

}

}



static int32_t SC_month()

{
@@ -516,16 +491,10 @@ static int32_t SC_month() 
    time_t rawtime;

    time(&rawtime);



    if (sc->mEnviroment.mTimeZone) {

        struct tm timeinfo;

        localtime_tz(&rawtime, &timeinfo, sc->mEnviroment.mTimeZone);

        return timeinfo.tm_mon;

    } else {

    struct tm *timeinfo;

    timeinfo = localtime(&rawtime);

    return timeinfo->tm_mon;

}

}



static int32_t SC_year()

{
@@ -534,16 +503,10 @@ static int32_t SC_year() 
    time_t rawtime;

    time(&rawtime);



    if (sc->mEnviroment.mTimeZone) {

        struct tm timeinfo;

        localtime_tz(&rawtime, &timeinfo, sc->mEnviroment.mTimeZone);

        return timeinfo.tm_year;

    } else {

    struct tm *timeinfo;

    timeinfo = localtime(&rawtime);

    return timeinfo->tm_year;

}

}



static int32_t SC_uptimeMillis()

{