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

Commit 7e97d87b authored by Jesse Wilson's avatar Jesse Wilson Committed by Android Git Automerger
Browse files

am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo 

Merge commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp

* commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
  Move the public method HttpDateTime.parse() into AndroidHttpClient.
parents edc5c788 533d3546

common/java/com/android/common/OperationScheduler.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.common;



import android.content.SharedPreferences;

import android.net.http.HttpDateTime;

import android.net.http.AndroidHttpClient;

import android.text.format.Time;



import java.util.Map;
@@ -243,7 +243,7 @@ public class OperationScheduler { 
            return true;

        } catch (NumberFormatException nfe) {

            try {

                setMoratoriumTimeMillis(HttpDateTime.parse(retryAfter));

                setMoratoriumTimeMillis(AndroidHttpClient.parseDate(retryAfter));

                return true;

            } catch (IllegalArgumentException iae) {

                return false;