Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d4362f9 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Update CodeInspectionTest"

parents 533d8b6b 27c3fe65

tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor

+0 −3
Original line number Diff line number Diff line
@@ -10,8 +10,5 @@ com.android.settings.datausage.WifiDataUsageSummaryPreferenceController 
com.android.settings.fuelgauge.RestrictAppPreferenceController

com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController

com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController

com.android.settings.gestures.SystemNavigationEdgeToEdgePreferenceController

com.android.settings.gestures.SystemNavigationLegacyPreferenceController

com.android.settings.gestures.SystemNavigationSwipeUpPreferenceController

com.android.settings.security.VisiblePatternProfilePreferenceController

com.android.settings.wifi.details.WifiMeteredPreferenceController
 
 No newline at end of file

tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java

+8 −3
Original line number Diff line number Diff line
@@ -58,12 +58,17 @@ public class BasePreferenceControllerSignatureInspector extends CodeInspector { 
            if (constructors == null || constructors.length == 0) {

                badClasses.append(c.getName()).append(",");

            }



            boolean hasValidConstructor = false;

            for (Constructor constructor : constructors) {

                if (!hasValidConstructorSignature(constructor)) {

                    badClasses.append(className).append(",");

                    continue;

                if (hasValidConstructorSignature(constructor)) {

                    hasValidConstructor = true;

                    break;

                }

            }

            if (!hasValidConstructor) {

                badClasses.append(className).append(",");

            }

        }



        assertWithMessage("All BasePreferenceController (and subclasses) constructor must either"