From ac8dea12c17aa047e03a358110aeb60401d36aa2 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 20 Apr 2011 18:18:51 -0700 Subject: DO NOT MERGE. Integrate from master: Rework display size access. Applications now get the display size from the window manager. No behavior should be changed yet, this is just prep for some real changes. Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2 --- core/java/android/view/ViewRoot.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'core/java/android/view/ViewRoot.java') diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index a53c6d0..a4aeed8 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -255,9 +255,8 @@ public final class ViewRoot extends Handler implements ViewParent, if (!mInitialized) { try { InputMethodManager imm = InputMethodManager.getInstance(mainLooper); - sWindowSession = IWindowManager.Stub.asInterface( - ServiceManager.getService("window")) - .openSession(imm.getClient(), imm.getInputContext()); + sWindowSession = Display.getWindowManager().openSession( + imm.getClient(), imm.getInputContext()); mInitialized = true; } catch (RemoteException e) { } -- cgit v1.1