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

Commit a1916d8a authored by Tom Chan's avatar Tom Chan
Browse files

Fix unintended early return in service creation. 

The early return is only intended for tests, but we will hit it in prod
if serviceNames has length 2.

This is uncovered when we set a non-empty value for
config_defaultWearableSensingService. Despite how
config_defaultAmbientContextServices is defined as a list with two
elements in frameworks/base/core/res/res/values/config.xml, if
config_defaultWearableSensingService is not defined, its length will be
1, so we do not see this problem in prod now.

Bug: 315506811
Test: On device, atest CtsAmbientContextServiceTestCases, and atest
CtsWearableSensingServiceTestCases

Change-Id: Ic2f8e3d5a61da4a1cb41070a53f22ecea8ace680
parent fbfe3166

services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java

+19 −11
Original line number Diff line number Diff line
@@ -226,20 +226,28 @@ public class AmbientContextManagerService extends 


        List<AmbientContextManagerPerUserService> serviceList =

                new ArrayList<>(serviceNames.length);

        if (serviceNames.length == 2) {

        if (serviceNames.length == 2

                && !isDefaultService(serviceNames[0])

                && !isDefaultWearableService(serviceNames[1])) {

            Slog.i(TAG, "Not using default services, "

                    + "services provided for testing should be exactly two services.");

            if (!isDefaultService(serviceNames[0]) && !isDefaultWearableService(serviceNames[1])) {

                serviceList.add(new DefaultAmbientContextManagerPerUserService(

                        this, mLock, resolvedUserId,

                        AmbientContextManagerPerUserService.ServiceType.DEFAULT, serviceNames[0]));

                serviceList.add(new WearableAmbientContextManagerPerUserService(

                        this, mLock, resolvedUserId,

            serviceList.add(

                    new DefaultAmbientContextManagerPerUserService(

                            this,

                            mLock,

                            resolvedUserId,

                            AmbientContextManagerPerUserService.ServiceType.DEFAULT,

                            serviceNames[0]));

            serviceList.add(

                    new WearableAmbientContextManagerPerUserService(

                            this,

                            mLock,

                            resolvedUserId,

                            AmbientContextManagerPerUserService.ServiceType.WEARABLE,

                            serviceNames[1]));

            }

            return serviceList;

        } else {

        }

        if (serviceNames.length > 2) {

            Slog.i(TAG, "Incorrect number of services provided for testing.");

        }