commit 9dfa89448924b14898dae4363b3ff79b7a9b8b51
author Chris Banes <chrisbanes@google.com> Tue May 07 18:44:39 2013 +0100
committer Chris Banes <chrisbanes@google.com> Tue May 07 19:41:40 2013 +0100
tree b5ae195ad50a489a8cc4eb6b9b0d3ebabee4fa5d
parent 4d43916b89d85315e1f344d992325e8ab106fb4e

Fix StackOverflowError in ABC: #8842602

Change-Id: If39d3a00c1d9ba8cc17e159919d4f2521794bde5

v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHC.java

diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHC.java b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHC.java
index 30dd518..085f6b2 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHC.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHC.java
@@ -219,7 +219,7 @@
         return false;
     }
 
-    static class WindowCallbackWrapper implements Window.Callback {
+    class WindowCallbackWrapper implements Window.Callback {
         final Window.Callback mWrapped;
 
         public WindowCallbackWrapper(Window.Callback wrapped) {
@@ -329,13 +329,13 @@
         @Override
         public void onActionModeStarted(android.view.ActionMode mode) {
             mWrapped.onActionModeStarted(mode);
-            onActionModeStarted(mode);
+            ActionBarActivityDelegateHC.this.onActionModeStarted(mode);
         }
 
         @Override
         public void onActionModeFinished(android.view.ActionMode mode) {
             mWrapped.onActionModeFinished(mode);
-            onActionModeFinished(mode);
+            ActionBarActivityDelegateHC.this.onActionModeFinished(mode);
         }
     }
 }

v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHCMR1.java

diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHCMR1.java b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHCMR1.java
index 65b46b5..00cf91a 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHCMR1.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateHCMR1.java
@@ -31,7 +31,8 @@
         return new WindowCallbackWrapperHCMR1(cb);
     }
 
-    static class WindowCallbackWrapperHCMR1 extends WindowCallbackWrapper {
+    class WindowCallbackWrapperHCMR1 extends WindowCallbackWrapper {
+
         public WindowCallbackWrapperHCMR1(Window.Callback wrapped) {
             super(wrapped);
         }