From 2d5618c22101cfc4d6478cfe1d846798389540c1 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Thu, 18 Oct 2012 13:55:47 -0700 Subject: 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 --- core/java/android/view/WindowManagerGlobal.java | 1 + 1 file changed, 1 insertion(+) (limited to 'core/java/android/view') 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; -- cgit v1.1