Snap for 6439596 from 4bbf496bb9b79ca7ac0a09f004c56a5b40aa2b22 to qt-aml-tzdata-release
Change-Id: Ic8ba38c7fe4f390c3552c6d20c8488ae12cd1027
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b6754de..70cc833 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -49,6 +49,3 @@
# ************************************************
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android-ex-camera2-portability_intermediates/)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib/libframesequence.so)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib64/libframesequence.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/FrameSequenceSample)
diff --git a/common/java/com/android/common/LegacyHttpDateTime.java b/common/java/com/android/common/LegacyHttpDateTime.java
index 83befa6..9b902d6 100644
--- a/common/java/com/android/common/LegacyHttpDateTime.java
+++ b/common/java/com/android/common/LegacyHttpDateTime.java
@@ -16,9 +16,9 @@
package com.android.common;
+import android.text.format.Time;
+
import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -108,16 +108,17 @@
}
}
- TimeZone utc = TimeZone.getTimeZone("UTC");
- GregorianCalendar calendar = new GregorianCalendar(utc);
- calendar.set(Calendar.YEAR, year);
- calendar.set(Calendar.MONTH, month);
- calendar.set(Calendar.DAY_OF_MONTH, date);
- calendar.set(Calendar.HOUR_OF_DAY, timeOfDay.hour);
- calendar.set(Calendar.MINUTE, timeOfDay.minute);
- calendar.set(Calendar.SECOND, timeOfDay.second);
- calendar.set(Calendar.MILLISECOND, 0);
- return calendar.getTimeInMillis();
+ // FIXME: Y2038 BUG!
+ if (year >= 2038) {
+ year = 2038;
+ month = Calendar.JANUARY;
+ date = 1;
+ }
+
+ Time time = new Time(Time.TIMEZONE_UTC);
+ time.set(timeOfDay.second, timeOfDay.minute, timeOfDay.hour, date,
+ month, year);
+ return time.toMillis(false /* use isDst */);
}
private static int getDate(String dateString) {
diff --git a/framesequence/jni/Android.bp b/framesequence/jni/Android.bp
index f2fd41b..4e57548 100644
--- a/framesequence/jni/Android.bp
+++ b/framesequence/jni/Android.bp
@@ -50,6 +50,4 @@
"libjnigraphics",
"liblog",
],
-
- product_specific: true,
}
diff --git a/framesequence/jni/Stream.cpp b/framesequence/jni/Stream.cpp
index 10dc805..a576e66 100644
--- a/framesequence/jni/Stream.cpp
+++ b/framesequence/jni/Stream.cpp
@@ -36,7 +36,7 @@
}
Stream::~Stream() {
- delete[] mPeekBuffer;
+ delete mPeekBuffer;
}
size_t Stream::peek(void* buffer, size_t size) {
@@ -46,7 +46,7 @@
mPeekBuffer = new char[size];
if (old_peek) {
memcpy(mPeekBuffer, old_peek + mPeekOffset, peek_remaining);
- delete[] old_peek;
+ delete old_peek;
}
size_t read = doRead(mPeekBuffer + mPeekOffset, size - peek_remaining);
mPeekOffset = 0;
@@ -65,7 +65,7 @@
memcpy(buffer, mPeekBuffer + mPeekOffset, bytes_read);
mPeekOffset += bytes_read;
if (mPeekOffset == mPeekSize) {
- delete[] mPeekBuffer;
+ delete mPeekBuffer;
mPeekBuffer = 0;
mPeekOffset = 0;
mPeekSize = 0;
diff --git a/framesequence/samples/FrameSequenceSamples/Android.bp b/framesequence/samples/FrameSequenceSamples/Android.bp
index 24458df..6df8d05 100644
--- a/framesequence/samples/FrameSequenceSamples/Android.bp
+++ b/framesequence/samples/FrameSequenceSamples/Android.bp
@@ -31,5 +31,4 @@
"com.android.framesequence.samples",
],
- product_specific: true,
}
