am dac92e6f: am 3e584fc9: Merge change I5975651f into eclair

Merge commit 'dac92e6fb6a29d827b9cbee7712ca07218bb55da' into eclair-mr2-plus-aosp

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

1 files changed, 18 insertions, 55 deletions

diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp
index 5aef56d..23888ff 100644
--- a/libs/rs/rsScriptC_Lib.cpp
+++ b/libs/rs/rsScriptC_Lib.cpp
@@ -28,7 +28,6 @@
 #include <GLES/glext.h>
 
 #include <time.h>
-#include <cutils/tztime.h>
 
 using namespace android;
 using namespace android::renderscript;
@@ -444,15 +443,9 @@ 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;
-    }
+    struct tm *timeinfo;
+    timeinfo = localtime(&rawtime);
+    return timeinfo->tm_sec;
 }
 
 static int32_t SC_minute()
@@ -462,15 +455,9 @@ 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;
-    }
+    struct tm *timeinfo;
+    timeinfo = localtime(&rawtime);
+    return timeinfo->tm_min;
 }
 
 static int32_t SC_hour()
@@ -480,15 +467,9 @@ 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;
-    }
+    struct tm *timeinfo;
+    timeinfo = localtime(&rawtime);
+    return timeinfo->tm_hour;
 }
 
 static int32_t SC_day()
@@ -498,15 +479,9 @@ 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;
-    }
+    struct tm *timeinfo;
+    timeinfo = localtime(&rawtime);
+    return timeinfo->tm_mday;
 }
 
 static int32_t SC_month()
@@ -516,15 +491,9 @@ 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;
-    }
+    struct tm *timeinfo;
+    timeinfo = localtime(&rawtime);
+    return timeinfo->tm_mon;
 }
 
 static int32_t SC_year()
@@ -534,15 +503,9 @@ 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;
-    }
+    struct tm *timeinfo;
+    timeinfo = localtime(&rawtime);
+    return timeinfo->tm_year;
 }
 
 static int32_t SC_uptimeMillis()