Merge "Refactor: Remove unused branch." am: a9f7998ff4 am: 4d7203226a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1820992

Change-Id: Ie373ca3f846f24672d61ebb34216eba3daeff0f9

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;