drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '21246bd92f54be468496848b659bf47f2522430a':
  Fix isThemeAppCompat NPE when using an invalid theme
This commit is contained in:
Diego Perez
2015-05-07 00:21:09 +00:00
committed by Android Git Automerger
parent 9c9bcd3486 21246bd92f
commit 9efcb30861
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
View File

@ -1199,15 +1199,15 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
// between Theme.AppCompat.Light and Theme.AppCompat is Theme.Material (for v21). // between Theme.AppCompat.Light and Theme.AppCompat is Theme.Material (for v21).
boolean isThemeAppCompat = false; boolean isThemeAppCompat = false;
for (int i = 0; i < 50; i++) { for (int i = 0; i < 50; i++) {
if (defaultTheme == null) {
break;
}
// for loop ensures that we don't run into cyclic theme inheritance. // for loop ensures that we don't run into cyclic theme inheritance.
if (defaultTheme.getName().startsWith("Theme.AppCompat")) { if (defaultTheme.getName().startsWith("Theme.AppCompat")) {
isThemeAppCompat = true; isThemeAppCompat = true;
break; break;
} }
defaultTheme = resources.getParent(defaultTheme); defaultTheme = resources.getParent(defaultTheme);
if (defaultTheme == null) {
break;
}
} }
mIsThemeAppCompat = isThemeAppCompat; mIsThemeAppCompat = isThemeAppCompat;
} }