diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-09-20 10:43:24 -0700 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2013-09-20 10:43:29 -0700 |
| commit | b206f1271d17164c3f2f65219eee7a0b4b4fa6dc (patch) | |
| tree | 3f3b2e8800855c4aba72110e0314477fd3ec704a /packages/PrintSpooler/src/com/android | |
| parent | 562ce888af21fc18d1610545ff6373ee2ecbbb13 (diff) | |
| download | frameworks_base-b206f1271d17164c3f2f65219eee7a0b4b4fa6dc.zip frameworks_base-b206f1271d17164c3f2f65219eee7a0b4b4fa6dc.tar.gz frameworks_base-b206f1271d17164c3f2f65219eee7a0b4b4fa6dc.tar.bz2 | |
Null not handled when parsing media size resource id attribute.
bug:10835715
Change-Id: I0c9c1120c26e68b4c582599bbda3753d0e443d8c
Diffstat (limited to 'packages/PrintSpooler/src/com/android')
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java | 5 |
1 files 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 a6353f7..fb2c935 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); |