drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I5975651f into eclair

Browse Source 
* changes:
  Don't feed the timezone to RenderScript time functions, let the library figure it out.
This commit is contained in:
Android (Google) Code Review
2009-11-11 15:37:37 -08:00
parent f1f26bbb2a baed727481
commit 3e584fc944
1 changed files with 18 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libs/rs/rsScriptC_Lib.cpp
View File

@ -28,7 +28,6 @@
#include <GLES/glext.h> #include <GLES/glext.h>
#include <time.h> #include <time.h>
#include <cutils/tztime.h>
using namespace android; using namespace android;
using namespace android::renderscript; using namespace android::renderscript;
@ -444,16 +443,10 @@ static int32_t SC_second()
time_t rawtime; time_t rawtime;
time(&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; struct tm *timeinfo;
timeinfo = localtime(&rawtime); timeinfo = localtime(&rawtime);
return timeinfo->tm_sec; return timeinfo->tm_sec;
} }
}
static int32_t SC_minute() static int32_t SC_minute()
{ {
@ -462,16 +455,10 @@ static int32_t SC_minute()
time_t rawtime; time_t rawtime;
time(&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; struct tm *timeinfo;
timeinfo = localtime(&rawtime); timeinfo = localtime(&rawtime);
return timeinfo->tm_min; return timeinfo->tm_min;
} }
}
static int32_t SC_hour() static int32_t SC_hour()
{ {
@ -480,16 +467,10 @@ static int32_t SC_hour()
time_t rawtime; time_t rawtime;
time(&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; struct tm *timeinfo;
timeinfo = localtime(&rawtime); timeinfo = localtime(&rawtime);
return timeinfo->tm_hour; return timeinfo->tm_hour;
} }
}
static int32_t SC_day() static int32_t SC_day()
{ {
@ -498,16 +479,10 @@ static int32_t SC_day()
time_t rawtime; time_t rawtime;
time(&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; struct tm *timeinfo;
timeinfo = localtime(&rawtime); timeinfo = localtime(&rawtime);
return timeinfo->tm_mday; return timeinfo->tm_mday;
} }
}
static int32_t SC_month() static int32_t SC_month()
{ {
@ -516,16 +491,10 @@ static int32_t SC_month()
time_t rawtime; time_t rawtime;
time(&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; struct tm *timeinfo;
timeinfo = localtime(&rawtime); timeinfo = localtime(&rawtime);
return timeinfo->tm_mon; return timeinfo->tm_mon;
} }
}
static int32_t SC_year() static int32_t SC_year()
{ {
@ -534,16 +503,10 @@ static int32_t SC_year()
time_t rawtime; time_t rawtime;
time(&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; struct tm *timeinfo;
timeinfo = localtime(&rawtime); timeinfo = localtime(&rawtime);
return timeinfo->tm_year; return timeinfo->tm_year;
} }
}
static int32_t SC_uptimeMillis() static int32_t SC_uptimeMillis()
{ {