Merge "Refactor FeatureFactory"

2023-06-29 09:01:17 +00:00
parent a15932274b 63eddc12dd
commit a935e680b0
10 changed files with 451 additions and 716 deletions
--- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -95,8 +95,9 @@ public class FakeFeatureFactory extends FeatureFactory {
     * Call this in {@code @Before} method of the test class to use fake factory.
     */
    public static FakeFeatureFactory setupForTest() {
-        sFactory = new FakeFeatureFactory();
-        return (FakeFeatureFactory) sFactory;
+        FakeFeatureFactory factory = new FakeFeatureFactory();
+        setFactory(getAppContext(), factory);
+        return factory;
    }

  /**