Merge "Don't crash in window manager if we fail getting .apk resources." into jb-dev
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 2267f60..73bfe8e 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -4147,6 +4147,11 @@
if (theme != 0) {
AttributeCache.Entry ent = AttributeCache.instance().get(pkg, theme,
com.android.internal.R.styleable.Window);
+ if (ent == null) {
+ // Whoops! App doesn't exist. Um. Okay. We'll just
+ // pretend like we didn't see that.
+ return;
+ }
if (ent.array.getBoolean(
com.android.internal.R.styleable.Window_windowIsTranslucent, false)) {
return;