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

Commit 766416b7 authored by Jared Duke's avatar Jared Duke
Browse files

Update PinnerService TEST_MAPPING 

Ensure PinnerServiceTest runs in presubmit for changes to PinnerService.

Note: Configuring pre/postsubmit for FrameworksServicesTests for tests
in the top-level `com.android.server` package is awkward due to package
wildcards and TEST_MAPPING inheritance. A longer term solution would be
to migrate PinnerService into a more explicit sub-package, and/or break
its tests out into a separate test target.

Bug: 309853498
Test: presubmit
Change-Id: If60c9927e6db38dc96e6a2c765fee437b2f07605
parent 7d859fde

services/core/java/com/android/server/PinnerService.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,7 @@ import sun.misc.Unsafe; 
 * <p>Files to pin are specified in the config_defaultPinnerServiceFiles

 * <p>Files to pin are specified in the config_defaultPinnerServiceFiles

 * overlay.</p>

 * overlay.</p>

 * <p>Pin the default camera application if specified in config_pinnerCameraApp.</p>

 * <p>Pin the default camera application if specified in config_pinnerCameraApp.</p>

 * <p>(Optional) Pin experimental carveout regions based on DeviceConfig flags.</p>

 */

 */

public final class PinnerService extends SystemService {

public final class PinnerService extends SystemService {

    private static final boolean DEBUG = false;

    private static final boolean DEBUG = false;

services/core/java/com/android/server/TEST_MAPPING

+24 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,18 @@ 
            ],

            ],

            "file_patterns": ["BinaryTransparencyService\\.java"]

            "file_patterns": ["BinaryTransparencyService\\.java"]

        },

        },

        {

            "name": "FrameworksServicesTests",

            "options": [

                {

                    "include-filter": "com.android.server.PinnerServiceTest"

                },

                {

                    "exclude-annotation": "org.junit.Ignore"

                }

            ],

            "file_patterns": ["PinnerService\\.java"]

        },

        {

        {

            "name": "BinaryTransparencyHostTest",

            "name": "BinaryTransparencyHostTest",

            "file_patterns": ["BinaryTransparencyService\\.java"]

            "file_patterns": ["BinaryTransparencyService\\.java"]
@@ -139,6 +151,18 @@ 
        },

        },

        {

        {

            "name": "CtsSuspendAppsTestCases"

            "name": "CtsSuspendAppsTestCases"

        },

        {

            "name": "FrameworksServicesTests",

            "options": [

                {

                    "include-filter": "com.android.server.PinnerServiceTest"

                },

                {

                    "exclude-annotation": "org.junit.Ignore"

                }

            ],

            "file_patterns": ["PinnerService\\.java"]

        }

        }

    ]

    ]

}
 
}