Merge "Don't use timestamps with all zero"

package android.media;

import java.io.IOException;

import java.util.regex.Matcher;

import java.util.regex.Pattern;

import java.text.ParsePosition;

import java.text.SimpleDateFormat;

import java.util.Date;

    // use sLock to serialize the accesses.

    private static final Object sLock = new Object();

    // Pattern to check non zero timestamp

    private static final Pattern sNonZeroTimePattern = Pattern.compile(".*[1-9].*");

    /**

     * Reads Exif tags from the specified JPEG file.

     */

     */

    public long getDateTime() {

        String dateTimeString = mAttributes.get(TAG_DATETIME);

        if (dateTimeString == null) return -1;

        if (dateTimeString == null

                || !sNonZeroTimePattern.matcher(dateTimeString).matches()) return -1;

        ParsePosition pos = new ParsePosition(0);

        try {

    public long getGpsDateTime() {

        String date = mAttributes.get(TAG_GPS_DATESTAMP);

        String time = mAttributes.get(TAG_GPS_TIMESTAMP);

        if (date == null || time == null) return -1;

        if (date == null || time == null

                || (!sNonZeroTimePattern.matcher(date).matches()

                && !sNonZeroTimePattern.matcher(time).matches())) return -1;

        String dateTimeString = date + ' ' + time;