Edit NEM tests to prevent flakiness

- Set the Assert's main looper as the TestableLooper's looper for all
NEM tests
- in NEM test, bind content synchronously, so the callback won't run on
the 'real' main thread and will instead run on the TestableLooper's
thread
- Allow overriding already initialized dependencies in
TestableDependency

Test: atest SystemUITests
Fixes: 147685528
Change-Id: Ic171bf29e33322f44aa14c40c29c0d9ffa542ade

1 files changed, 3 insertions, 1 deletions

diff --git a/tests/testables/src/android/testing/TestableLooper.java b/tests/testables/src/android/testing/TestableLooper.java
index 8eac3ea13a23..fe0224a27c80 100644
--- a/tests/testables/src/android/testing/TestableLooper.java
+++ b/tests/testables/src/android/testing/TestableLooper.java
@@ -234,7 +234,9 @@ public class TestableLooper {
             try {
                 mLooper = setAsMain ? Looper.getMainLooper() : createLooper();
                 mTestableLooper = new TestableLooper(mLooper, false);
-                mTestableLooper.getLooper().getThread().setName(test.getClass().getName());
+                if (!setAsMain) {
+                    mTestableLooper.getLooper().getThread().setName(test.getClass().getName());
+                }
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }