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

Commit 4f946451 authored by Chen Bai's avatar Chen Bai Committed by Android (Google) Code Review
Browse files

Merge "adservices: optionally start AdServicesManagerService on Wear" into main

parents d87ac8d6 0e4df971

services/java/com/android/server/SystemServer.java

+12 −3
Original line number Diff line number Diff line
@@ -2922,9 +2922,18 @@ public final class SystemServer implements Dumpable { 
        t.traceEnd();



        // AdServicesManagerService (PP API service)

        if (!isWatch || !android.server.Flags.removeAdServicesManagerServiceFromWear()

                || SystemProperties.getBoolean("ro.system_settings.service.adservices_enabled",

                true)) {

            t.traceBegin("StartAdServicesManagerService");

            try {

                mSystemServiceManager.startService(AD_SERVICES_MANAGER_SERVICE_CLASS);

            } finally {

                t.traceEnd();

            }

        } else {

            Slog.d(TAG, "Not starting AdServicesManagerService");

        }



        // OnDevicePersonalizationSystemService

        if (SystemProperties.getBoolean("ro.system_settings.service.odp_enabled", true)) {

services/java/com/android/server/flags.aconfig

+8 −1
Original line number Diff line number Diff line
@@ -88,3 +88,10 @@ flag { 
    description: "Move VoiceInteractionManagerService getResources away from the boot critical path"

    bug: "406841419"

}



flag {

     name: "remove_ad_services_manager_service_from_wear"

     namespace: "wear_frameworks"

     description: "Remove AdServicesManagerService from Wear"

     bug: "340928611"

}