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

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

Merge "Remove flag optional_background_install_control" into main

parents 99f0cffc a320f39f

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

+2 −1
Original line number Diff line number Diff line
@@ -1646,7 +1646,8 @@ public class BinaryTransparencyService extends SystemService { 
    }



    private void registerBicCallback() {

        if(!com.android.server.flags.Flags.optionalBackgroundInstallControl()) {

        if(!SystemProperties.getBoolean(

                    "ro.system_settings.service.backgound_install_control_enabled", true)) {

            Slog.d(TAG, "BICS is disabled for this device, skipping registration.");

            return;

        }

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

+0 −7
Original line number Diff line number Diff line
@@ -22,13 +22,6 @@ flag { 
    }

}



flag {

    namespace: "wear_frameworks"

    name: "optional_background_install_control"

    description: "Enable BackgroundInstallControl based on system feature to prevent it from starting on form factors."

    bug: "340928990"

}



flag {

    namespace: "input"

    name: "modifier_shortcut_manager_multiuser"

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

+2 −3
Original line number Diff line number Diff line
@@ -2801,8 +2801,7 @@ public final class SystemServer implements Dumpable { 
            mSystemServiceManager.startService(MediaMetricsManagerService.class);

            t.traceEnd();



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

                    || SystemProperties.getBoolean(

            if (SystemProperties.getBoolean(

                    "ro.system_settings.service.backgound_install_control_enabled", true)) {

                t.traceBegin("StartBackgroundInstallControlService");

                mSystemServiceManager.startService(BackgroundInstallControlService.class);