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

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

Merge "Remove enable_odp_feature_guard" into main

parents 7fff7f5b e1d7482c

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

+0 −7
Original line number Diff line number Diff line 
package: "com.android.server.flags"

container: "system"



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"

}



flag {

    namespace: "input"

    name: "new_bugreport_keyboard_shortcut"

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

+1 −2
Original line number Diff line number Diff line
@@ -2913,8 +2913,7 @@ 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)) {

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

            t.traceBegin("StartOnDevicePersonalizationSystemService");

            mSystemServiceManager.startService(ON_DEVICE_PERSONALIZATION_SYSTEM_SERVICE_CLASS);

            t.traceEnd();