From 11dfd279a33e126d2df847656bf73fd92df79218 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Mon, 25 Mar 2019 19:21:26 +0100
Subject: WindowInsets: populate system gesture and tappable element insets

Also fixes an infinite recursion when invoking
TestableContext.(un)registerComponentCallbacks().

Test: atest WindowInsetsPolicyTest
Bug: 126511573
Change-Id: I5c9f40054493a83746bce6124d72412e8eb8a0d1
---
 tests/testables/src/android/testing/TestableContext.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/testables')

diff --git a/tests/testables/src/android/testing/TestableContext.java b/tests/testables/src/android/testing/TestableContext.java
index fff9635992d4..e2668bc4281f 100644
--- a/tests/testables/src/android/testing/TestableContext.java
+++ b/tests/testables/src/android/testing/TestableContext.java
@@ -296,13 +296,13 @@ public class TestableContext extends ContextWrapper implements TestRule {
     @Override
     public void registerComponentCallbacks(ComponentCallbacks callback) {
         if (mComponent != null) mComponent.getLeakInfo(callback).addAllocation(new Throwable());
-        super.registerComponentCallbacks(callback);
+        getBaseContext().registerComponentCallbacks(callback);
     }
 
     @Override
     public void unregisterComponentCallbacks(ComponentCallbacks callback) {
         if (mComponent != null) mComponent.getLeakInfo(callback).clearAllocations();
-        super.unregisterComponentCallbacks(callback);
+        getBaseContext().unregisterComponentCallbacks(callback);
     }
 
     public TestablePermissions getTestablePermissions() {
-- 
cgit v1.2.3-59-g8ed1b