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

Commit 78294408 authored by Timothy Yiu's avatar Timothy Yiu Committed by Android (Google) Code Review
Browse files

Merge "Option for disabling ODP" into main

parents 06449de7 6cac6fdb

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

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.server.flags"



flag {

     namespace: "wear_frameworks"

     name: "enable_odp_feature_guard"

     description: "Enable guard based on system feature to prevent OnDevicePersonalization service from starting on form factors."

     bug: "322249125"

}
 
 No newline at end of file

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

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



        // OnDevicePersonalizationSystemService

        if (!com.android.server.flags.Flags.enableOdpFeatureGuard()

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

            t.traceBegin("StartOnDevicePersonalizationSystemService");

            mSystemServiceManager.startService(ON_DEVICE_PERSONALIZATION_SYSTEM_SERVICE_CLASS);

            t.traceEnd();

        }



        // Profiling

        if (android.server.Flags.telemetryApisService()) {