commit 9e12f816fd1d0b03cc3562c681d774e6a9798ee8
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Nov 17 03:30:29 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 17 03:30:29 2018 +0000
tree 9a29152e0b585c3176125f0b7fafb813a39a049e
parent 49e41d949e898dc5e435b623b88638a81fe3ce7f
parent 29397ce998c82b33df42ad4e8a822e83fa8495a0

Merge "Temporarily disabled IntelligenceService."

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

diff --git a/core/java/android/view/intelligence/IntelligenceManager.java b/core/java/android/view/intelligence/IntelligenceManager.java
index b74600b..242bf6a 100644
--- a/core/java/android/view/intelligence/IntelligenceManager.java
+++ b/core/java/android/view/intelligence/IntelligenceManager.java
@@ -196,6 +196,7 @@
 
     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

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 3bb8ce3..f8ac41f 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -804,8 +804,11 @@
 
         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 @@
                 traceBeginAndSlog("StartIntelligenceService");
                 mSystemServiceManager.startService(INTELLIGENCE_MANAGER_SERVICE_CLASS);
                 traceEnd();
+            } else {
+                Slog.d(TAG, "IntelligenceService disabled");
             }
 
             // NOTE: ClipboardService indirectly depends on IntelligenceService