diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 12:57:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-16 12:57:00 -0700 |
| commit | d90a2c4d4463085155444efb07eba2d6579b444a (patch) | |
| tree | 32467c0ecbd3648b4f393d2234b8ad686cf69a3f /core/java/android/view/ViewRoot.java | |
| parent | e23639e0386735df50ad208078f638c38f662d42 (diff) | |
| parent | 1e662c3294b740ff694ad98e4d9a366e1e4b5e62 (diff) | |
| download | frameworks_base-d90a2c4d4463085155444efb07eba2d6579b444a.zip frameworks_base-d90a2c4d4463085155444efb07eba2d6579b444a.tar.gz frameworks_base-d90a2c4d4463085155444efb07eba2d6579b444a.tar.bz2 | |
am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
DO NOT MERGE. Integrate from master: Rework display size access.
Diffstat (limited to 'core/java/android/view/ViewRoot.java')
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 7d6e18f..2ba28c6 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) { } |