Skip to content

Commit 0b9b053

Browse files
Dianne HackbornAndroid (Google) Code Review
authored andcommitted
Merge "Don't crash in window manager if we fail getting .apk resources." into jb-dev
2 parents 50e990c + 0b80019 commit 0b9b053

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4147,6 +4147,11 @@ public void setAppStartingWindow(IBinder token, String pkg,
41474147
if (theme != 0) {
41484148
AttributeCache.Entry ent = AttributeCache.instance().get(pkg, theme,
41494149
com.android.internal.R.styleable.Window);
4150+
if (ent == null) {
4151+
// Whoops! App doesn't exist. Um. Okay. We'll just
4152+
// pretend like we didn't see that.
4153+
return;
4154+
}
41504155
if (ent.array.getBoolean(
41514156
com.android.internal.R.styleable.Window_windowIsTranslucent, false)) {
41524157
return;

0 commit comments

Comments
 (0)