diff options
| author | Craig Mautner <cmautner@google.com> | 2012-10-18 13:55:47 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-10-18 14:16:43 -0700 |
| commit | 2d5618c22101cfc4d6478cfe1d846798389540c1 (patch) | |
| tree | 79d257c2ea8e6861178addf2990106ea2813248d /core/java/android/view/WindowManagerGlobal.java | |
| parent | b8460d153a1e6dfc6a02ab127d4b5b5e82386137 (diff) | |
| download | frameworks_base-2d5618c22101cfc4d6478cfe1d846798389540c1.zip frameworks_base-2d5618c22101cfc4d6478cfe1d846798389540c1.tar.gz frameworks_base-2d5618c22101cfc4d6478cfe1d846798389540c1.tar.bz2 | |
Allow getDisplayContentLocked to return null...
... and check for null returns. This prevents DisplayContent objects
from containing null Display references.
Bug: 7368565 fixed.
Change-Id: I830fb4c1349204c366193657a95a92c48ccee66c
Diffstat (limited to 'core/java/android/view/WindowManagerGlobal.java')
| -rw-r--r-- | core/java/android/view/WindowManagerGlobal.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java index 7855763c..5cdc1ed 100644 --- a/core/java/android/view/WindowManagerGlobal.java +++ b/core/java/android/view/WindowManagerGlobal.java @@ -99,6 +99,7 @@ public final class WindowManagerGlobal { public static final int ADD_STARTING_NOT_NEEDED = -6; public static final int ADD_MULTIPLE_SINGLETON = -7; public static final int ADD_PERMISSION_DENIED = -8; + public static final int ADD_INVALID_DISPLAY = -9; private static WindowManagerGlobal sDefaultWindowManager; private static IWindowManager sWindowManagerService; |