diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-06-08 21:51:44 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2011-06-08 22:26:33 -0700 |
commit | 48a7651823030ed3c0f4c084b423430044425fea (patch) | |
tree | 593a12e4aa51d8bff8fdb7cf34f3afca9f7e8a99 /core | |
parent | 021408910af170268cb486910d4dd5a7d838c2bb (diff) | |
download | frameworks_base-48a7651823030ed3c0f4c084b423430044425fea.zip frameworks_base-48a7651823030ed3c0f4c084b423430044425fea.tar.gz frameworks_base-48a7651823030ed3c0f4c084b423430044425fea.tar.bz2 |
Fix for not reporting correct "sw" in compat mode.
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/view/WindowManagerImpl.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java index a853c15..02ab1dc 100644 --- a/core/java/android/view/WindowManagerImpl.java +++ b/core/java/android/view/WindowManagerImpl.java @@ -342,9 +342,11 @@ public class WindowManagerImpl implements WindowManager { return view; } - InputMethodManager imm = InputMethodManager.getInstance(view.getContext()); - if (imm != null) { - imm.windowDismissed(mViews[index].getWindowToken()); + if (view != null) { + InputMethodManager imm = InputMethodManager.getInstance(view.getContext()); + if (imm != null) { + imm.windowDismissed(mViews[index].getWindowToken()); + } } root.die(false); finishRemoveViewLocked(view, index); @@ -368,9 +370,11 @@ public class WindowManagerImpl implements WindowManager { removeItem(tmpParams, mParams, index); mParams = tmpParams; - view.assignParent(null); - // func doesn't allow null... does it matter if we clear them? - //view.setLayoutParams(null); + if (view != null) { + view.assignParent(null); + // func doesn't allow null... does it matter if we clear them? + //view.setLayoutParams(null); + } } public void closeAll(IBinder token, String who, String what) { |