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

Commit 9e12f816 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Temporarily disabled IntelligenceService."

parents 49e41d94 29397ce9

core/java/android/view/intelligence/IntelligenceManager.java

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ public final class IntelligenceManager { 


    private void handleSendEvent(@NonNull ContentCaptureEvent event) {



        //TODO(b/111276913): make a copy and don't use lock

        synchronized (mLock) {

            mEvents.add(event);

            final int numberEvents = mEvents.size();

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

+6 −1
Original line number Diff line number Diff line
@@ -804,8 +804,11 @@ public final class SystemServer { 


        boolean disableSystemTextClassifier = SystemProperties.getBoolean(

                "config.disable_systemtextclassifier", false);



        //TODO(b/111276913): temporarily disabled until the manager is properly implemented to

        // ignore events when disabled and buffer when enabled

        boolean disableIntelligence = SystemProperties.getBoolean(

                "config.disable_intelligence", false);

                "config.disable_intelligence", true);

        boolean disableNetworkTime = SystemProperties.getBoolean("config.disable_networktime",

                false);

        boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",
@@ -1140,6 +1143,8 @@ public final class SystemServer { 
                traceBeginAndSlog("StartIntelligenceService");

                mSystemServiceManager.startService(INTELLIGENCE_MANAGER_SERVICE_CLASS);

                traceEnd();

            } else {

                Slog.d(TAG, "IntelligenceService disabled");

            }



            // NOTE: ClipboardService indirectly depends on IntelligenceService