commit 0b9b053ce6fdc48e922b6af37fe747b4ef40324a
author Dianne Hackborn <hackbod@google.com> Fri Jun 22 10:38:45 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 22 10:38:45 2012 -0700
tree 2f06a25a24041bb95389997ef26fb070f1ba2bee
parent 50e990c64fa23ce94efa76b9e72df7f8ec3cee6a
parent 0b800190d71bbe3459149f760f49dfa6208c0e21

Merge "Don't crash in window manager if we fail getting .apk resources." into jb-dev

services/java/com/android/server/wm/WindowManagerService.java

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;