Merge "[SuwLib] Catch RuntimeException during template inflation" into ub-setupwizard-belgarath

2 files changed, 6 insertions, 2 deletions

diff --git a/library/main/src/com/android/setupwizardlib/GlifLayout.java b/library/main/src/com/android/setupwizardlib/GlifLayout.java
index 42ba8f2..89ebb5a 100644
--- a/library/main/src/com/android/setupwizardlib/GlifLayout.java
+++ b/library/main/src/com/android/setupwizardlib/GlifLayout.java
@@ -124,7 +124,9 @@ public class GlifLayout extends TemplateLayout {
         }
         try {
             return super.onInflateTemplate(inflater, template);
-        } catch (InflateException e) {
+        } catch (RuntimeException e) {
+            // Versions before M throws RuntimeException for unsuccessful attribute resolution
+            // Versions M+ will throw an InflateException (which extends from RuntimeException)
             throw new InflateException("Unable to inflate layout. Are you using "
                     + "@style/SuwThemeGlif (or its descendant) as your theme?", e);
         }
diff --git a/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java b/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java
index 23a75b9..3906a9b 100644
--- a/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java
+++ b/library/main/src/com/android/setupwizardlib/SetupWizardLayout.java
@@ -169,7 +169,9 @@ public class SetupWizardLayout extends TemplateLayout {
         }
         try {
             return super.onInflateTemplate(inflater, template);
-        } catch (InflateException e) {
+        } catch (RuntimeException e) {
+            // Versions before M throws RuntimeException for unsuccessful attribute resolution
+            // Versions M+ will throw an InflateException (which extends from RuntimeException)
             throw new InflateException("Unable to inflate layout. Are you using "
                     + "@style/SuwThemeMaterial (or its descendant) as your theme?", e);
         }