Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev

Browse Source 
* commit 'a517e81e2b1594da3e12c0547aabac5f357ce97b':
  Fix crash on pasting text in a WebView
This commit is contained in:
Paul Miller
2015-01-07 01:17:32 +00:00
committed by Android Git Automerger
parent d0173277b2 a517e81e2b
commit c2a17fff85
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/app/WindowDecorActionBar.java
View File

@@ -993,6 +993,13 @@ public class WindowDecorActionBar extends ActionBar implements
@Override @Override
public void invalidate() { public void invalidate() {
if (mActionMode != this) {
// Not the active action mode - no-op. It's possible we are
// currently deferring onDestroy, so the app doesn't yet know we
// are going away and is trying to use us. That's also a no-op.
return;
}
mMenu.stopDispatchingItemsChanged(); mMenu.stopDispatchingItemsChanged();
try { try {
mCallback.onPrepareActionMode(this, mMenu); mCallback.onPrepareActionMode(this, mMenu);