diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-06-22 10:40:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-22 10:40:53 -0700 |
| commit | 176a8a8b7cba2654f50617b14a841ef977b95b11 (patch) | |
| tree | 1e81d4a547b68372609898195ecf3a2ee6ce0b6c /services | |
| parent | b8e1319f0aef6880c46de9f2a563fd1ae80c84c9 (diff) | |
| parent | 0b9b053ce6fdc48e922b6af37fe747b4ef40324a (diff) | |
| download | frameworks_base-176a8a8b7cba2654f50617b14a841ef977b95b11.zip frameworks_base-176a8a8b7cba2654f50617b14a841ef977b95b11.tar.gz frameworks_base-176a8a8b7cba2654f50617b14a841ef977b95b11.tar.bz2 | |
am 0b9b053c: Merge "Don\'t crash in window manager if we fail getting .apk resources." into jb-dev
* commit '0b9b053ce6fdc48e922b6af37fe747b4ef40324a':
Don't crash in window manager if we fail getting .apk resources.
Diffstat (limited to 'services')
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ public class WindowManagerService extends IWindowManager.Stub 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; |