summaryrefslogtreecommitdiff
path: root/graphics/java
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-02-14 21:14:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-02-14 21:14:31 +0000
commitaf73171510b44dc3b34ac38337341e1485e09009 (patch)
treeb2111ad032dded1f456f43e6c7d225028e7923e5 /graphics/java
parentf9723ba1e72da3b385471adfdd316d75d2a83329 (diff)
parent79a31f32cae01bb35e65867173769b48bc063763 (diff)
Merge "Restore getIntrinsicWidth behavior from Android O"
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/ImageDecoder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java
index 26c5080eead0..9b5e33017743 100644
--- a/graphics/java/android/graphics/ImageDecoder.java
+++ b/graphics/java/android/graphics/ImageDecoder.java
@@ -372,7 +372,7 @@ public final class ImageDecoder implements AutoCloseable {
}
mResources = res;
mInputStream = is;
- mInputDensity = res != null ? inputDensity : Bitmap.DENSITY_NONE;
+ mInputDensity = inputDensity;
}
final Resources mResources;