diff options
author | Adrian Roos <roosa@google.com> | 2019-03-25 19:21:26 +0100 |
---|---|---|
committer | Adrian Roos <roosa@google.com> | 2019-04-01 15:46:13 +0200 |
commit | 11dfd279a33e126d2df847656bf73fd92df79218 (patch) | |
tree | 5b810e7023ec21adf0384c027273c45b83f560c9 /tests/testables | |
parent | d96f4fa19c4531f6de96278e80ad6557e00e57c6 (diff) |
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
Diffstat (limited to 'tests/testables')
-rw-r--r-- | tests/testables/src/android/testing/TestableContext.java | 4 |
1 files changed, 2 insertions, 2 deletions
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() { |