Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '5006eb75e6d42ac107734fa8134a726158d768d8':
  Null not handled when parsing media size resource id attribute.
This commit is contained in:
Svetoslav
2013-09-20 12:02:12 -07:00
committed by Android Git Automerger
parent f203a62537 5006eb75e6
commit a7055b01ec
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
View File

@@ -1036,8 +1036,9 @@ public final class PrintSpoolerService extends Service {
final int heightMils = Integer.parseInt(parser.getAttributeValue(null, final int heightMils = Integer.parseInt(parser.getAttributeValue(null,
ATTR_HEIGHT_MILS)); ATTR_HEIGHT_MILS));
String packageName = parser.getAttributeValue(null, ATTR_PACKAGE_NAME); String packageName = parser.getAttributeValue(null, ATTR_PACKAGE_NAME);
final int labelResId = Integer.parseInt(parser.getAttributeValue(null, String labelResIdString = parser.getAttributeValue(null, ATTR_LABEL_RES_ID);
ATTR_LABEL_RES_ID)); final int labelResId = (labelResIdString != null)
? Integer.parseInt(labelResIdString) : 0;
label = parser.getAttributeValue(null, ATTR_LABEL); label = parser.getAttributeValue(null, ATTR_LABEL);
MediaSize mediaSize = new MediaSize(id, label, packageName, labelResId, MediaSize mediaSize = new MediaSize(id, label, packageName, labelResId,
widthMils, heightMils); widthMils, heightMils);