Merge "Allow package local mocking for ActivityManager Unit Tests."

1 files changed, 9 insertions, 1 deletions

diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
index 20077f3e94b0..d36f9d3505b2 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java
@@ -52,12 +52,20 @@ import org.mockito.MockitoAnnotations;
  * A base class to handle common operations in activity related unit tests.
  */
 public class ActivityTestsBase {
+    private static boolean sOneTimeSetupDone = false;
+
     private final Context mContext = InstrumentationRegistry.getContext();
     private HandlerThread mHandlerThread;
 
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
+        if (!sOneTimeSetupDone) {
+            sOneTimeSetupDone = true;
+
+            // Allows to mock package local classes and methods
+            System.setProperty("dexmaker.share_classloader", "true");
+            MockitoAnnotations.initMocks(this);
+        }
         mHandlerThread = new HandlerThread("ActivityTestsBaseThread");
         mHandlerThread.start();
     }