fix NFE

hundeva · Aug 12, 2018 · 6368b9d · 6368b9d
1 parent 4bef29e
commit 6368b9d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutManagerBackport.java b/src/com/android/launcher3/shortcuts/DeepShortcutManagerBackport.java
@@ -117,7 +117,8 @@ private static void parsePackageXml(Context context, String packageName, Compone
             }
 
             if (resource != null) {
-                parseXml = resourcesForApplication.getXml(Integer.parseInt(resource.substring(1)));
+                int resId = resourcesForApplication.getIdentifier(resource, null, packageName);
+                parseXml = resourcesForApplication.getXml(resId == 0 ? Integer.parseInt(resource.substring(1)) : resId);
                 while ((eventType = parseXml.nextToken()) != XmlPullParser.END_DOCUMENT) {
                     if (eventType == XmlPullParser.START_TAG) {
                         if (parseXml.getName().equals("shortcut")) {
@@ -139,7 +140,7 @@ private static void parsePackageXml(Context context, String packageName, Compone
                     }
                 }
             }
-        } catch (PackageManager.NameNotFoundException | Resources.NotFoundException | XmlPullParserException | IOException e) {
+        } catch (PackageManager.NameNotFoundException | Resources.NotFoundException | XmlPullParserException | IOException | NumberFormatException e) {
             e.printStackTrace();
         }
     }