| commit | 62d9aaed232f8669e79a01ae1c4f6d077ba59984 | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Thu Jun 18 17:20:19 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 18 17:20:21 2015 +0000 |
| tree | 6793502a9b463e859cfc982ff2adea60682d6dcb | |
| parent | 1d0e76a0ba8bfc5e280203a56e10be95dd959a51 [diff] | |
| parent | 8d4765883ff24f0f79bf64fea23d4687d50cec85 [diff] |
Merge "Fix memory leak in ToolbarActionBar" into lmp-mr1-ub-dev
diff --git a/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV7.java b/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV7.java index c9c989c..2f0d5af 100644 --- a/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV7.java +++ b/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV7.java
@@ -1835,7 +1835,8 @@ @Override public boolean dispatchKeyEvent(KeyEvent event) { - return AppCompatDelegateImplV7.this.dispatchKeyEvent(event); + return AppCompatDelegateImplV7.this.dispatchKeyEvent(event) + || super.dispatchKeyEvent(event); } @Override