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

Commit f382b43e authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "CacheManager: fix issue with expire time set to "now"" into gingerbread

parents f35c97cd 20fb241d

core/java/android/webkit/CacheManager.java

+2 −1
Original line number Diff line number Diff line
@@ -731,7 +731,8 @@ public final class CacheManager { 
            } catch (IllegalArgumentException ex) {

                // Take care of the special "-1" and "0" cases

                if ("-1".equals(ret.expiresString)

                        || "0".equals(ret.expiresString)) {

                        || "0".equals(ret.expiresString)

                        || "now".equals(ret.expiresString)) {

                    // make it expired, but can be used for history navigation

                    ret.expires = 0;

                } else {