commit 2792c7f6a2477e0e0a4fbf829ed3973654383a9c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 15 21:08:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 15 21:08:25 2018 +0000
tree 08ee05737e669845844c9639a4b3488fde628067
parent aedf031b216615b9d7253a3092363f252dd7041f
parent 2ec6657362523a409c91ce8a7ec0a316e33d8851

Merge "Do not check isPortait on null mediaSize"

core/java/com/android/internal/print/DumpUtils.java

diff --git a/core/java/com/android/internal/print/DumpUtils.java b/core/java/com/android/internal/print/DumpUtils.java
index 1916c11..f44a1d1 100644
--- a/core/java/com/android/internal/print/DumpUtils.java
+++ b/core/java/com/android/internal/print/DumpUtils.java
@@ -213,10 +213,9 @@
         PrintAttributes.MediaSize mediaSize = attributes.getMediaSize();
         if (mediaSize != null) {
             writeMediaSize(context, proto, "media_size", PrintAttributesProto.MEDIA_SIZE, mediaSize);
+            proto.write("is_portrait", PrintAttributesProto.IS_PORTRAIT, attributes.isPortrait());
         }
 
-        proto.write("is_portrait", PrintAttributesProto.IS_PORTRAIT, attributes.isPortrait());
-
         PrintAttributes.Resolution res = attributes.getResolution();
         if (res != null) {
             writeResolution(proto, "resolution", PrintAttributesProto.RESOLUTION, res);