From b206f1271d17164c3f2f65219eee7a0b4b4fa6dc Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Fri, 20 Sep 2013 10:43:24 -0700
Subject: [PATCH] Null not handled when parsing media size resource id
 attribute.

bug:10835715

Change-Id: I0c9c1120c26e68b4c582599bbda3753d0e443d8c
---
 .../src/com/android/printspooler/PrintSpoolerService.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
index a6353f7002474..fb2c935c3abae 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
@@ -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);