Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7a53dab authored by Diego Perez's avatar Diego Perez Committed by Android Git Automerger
Browse files

am 9efcb308: am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix... 

am 9efcb308: am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev

* commit '9efcb308':
  Fix isThemeAppCompat NPE when using an invalid theme
parents 15432daa 9efcb308

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -1210,15 +1210,15 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { 
          // between Theme.AppCompat.Light and Theme.AppCompat is Theme.Material (for v21).

            boolean isThemeAppCompat = false;

            for (int i = 0; i < 50; i++) {

                if (defaultTheme == null) {

                    break;

                }

                // for loop ensures that we don't run into cyclic theme inheritance.

                if (defaultTheme.getName().startsWith("Theme.AppCompat")) {

                    isThemeAppCompat = true;

                    break;

                }

                defaultTheme = resources.getParent(defaultTheme);

                if (defaultTheme == null) {

                    break;

                }

            }

            mIsThemeAppCompat = isThemeAppCompat;

        }