Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7055b01 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am 5006eb75: Merge "Null not handled when parsing media size resource id attribute." into klp-dev 

* commit '5006eb75':
  Null not handled when parsing media size resource id attribute.
parents f203a625 5006eb75

packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java

+3 −2
Original line number Diff line number Diff line
@@ -1036,8 +1036,9 @@ public final class PrintSpoolerService extends Service { 
                    final int heightMils = Integer.parseInt(parser.getAttributeValue(null,

                            ATTR_HEIGHT_MILS));

                    String packageName = parser.getAttributeValue(null, ATTR_PACKAGE_NAME);

                    final int labelResId = Integer.parseInt(parser.getAttributeValue(null,

                            ATTR_LABEL_RES_ID));

                    String labelResIdString = parser.getAttributeValue(null, ATTR_LABEL_RES_ID);

                    final int labelResId = (labelResIdString != null)

                            ? Integer.parseInt(labelResIdString) : 0;

                    label = parser.getAttributeValue(null, ATTR_LABEL);

                    MediaSize mediaSize = new MediaSize(id, label, packageName, labelResId,

                                widthMils, heightMils);