summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-09-09 01:23:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-09 01:23:06 +0000
commit2a4a3c0282803f32ad429cfc661723be5759023b (patch)
treee6d87d08044645966eefc1e9ed18e88f12220f04 /core/java
parentbbc4fce15713b57467bbc7787cc3e587cdfa3bc1 (diff)
parent45b057561e9a9efdb76c6e1481681d72f98f272a (diff)
Merge "Refactor: Remove unused branch." am: a9f7998ff4 am: 4d7203226a am: 19545b4cc5 am: 45b057561e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1820992 Change-Id: I21c282f211c5d7291f2e684fee490a6b005a721f
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/URLUtil.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/URLUtil.java b/core/java/android/webkit/URLUtil.java
index 844b156b84d3..c7609a6c18af 100644
--- a/core/java/android/webkit/URLUtil.java
+++ b/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;