am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev (8e75e307) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1199,15 +1199,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;
		}