diff options
| author | Craig Mautner <cmautner@google.com> | 2012-10-19 09:27:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-19 09:27:06 -0700 |
| commit | 0ed07a0a30ef71053d0426956d3c198bb7540d4e (patch) | |
| tree | 95eb638f3d0134079d526d15a2a1bc2e770b01b7 /core | |
| parent | e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18 (diff) | |
| parent | 2d5618c22101cfc4d6478cfe1d846798389540c1 (diff) | |
| download | frameworks_base-0ed07a0a30ef71053d0426956d3c198bb7540d4e.zip frameworks_base-0ed07a0a30ef71053d0426956d3c198bb7540d4e.tar.gz frameworks_base-0ed07a0a30ef71053d0426956d3c198bb7540d4e.tar.bz2 | |
Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
Diffstat (limited to 'core')
| -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; |