Merge "Fix isFeatureEnabled namespace and overload usage"

2023-05-08 03:19:27 +00:00
parent 8438c257fc 278db58bf5
commit ab809e5ce0
6 changed files with 15 additions and 15 deletions
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -2077,12 +2077,12 @@ public class ConnectivityServiceTest {
        }

        @Override
-        public boolean isFeatureEnabled(Context context, String name, boolean defaultEnabled) {
+        public boolean isFeatureEnabled(Context context, String name) {
            switch (name) {
                case ConnectivityFlags.NO_REMATCH_ALL_REQUESTS_ON_REGISTER:
                    return true;
                default:
-                    return super.isFeatureEnabled(context, name, defaultEnabled);
+                    return super.isFeatureEnabled(context, name);
            }
        }