Merge "Refactor: Remove unused branch."

core/java/android/webkit/URLUtil.java

@@ -310,7 +310,7 @@ public final class URLUtil {
         String extension = null;
 
         // If we couldn't do anything with the hint, move toward the content disposition
-        if (filename == null && contentDisposition != null) {
+        if (contentDisposition != null) {
             filename = parseContentDisposition(contentDisposition);
             if (filename != null) {
                 int index = filename.lastIndexOf('/') + 1;