commit 141864d61086c94fa3c04edac2c60858845c8af2
author Felipe Leme <felipeal@google.com> Wed Feb 27 17:01:51 2019 -0800
committer Felipe Leme <felipeal@google.com> Thu Mar 07 13:06:21 2019 -0800
tree cb2c8c43cf0f85b0adaacb3b43b0ebf59d37cbfc
parent b14ac6e9af3faa80b0c7cd48e36bda2767e5ed17

New API: ContentCaptureService.onActivityEvent()

This API is needed for high-level events that happened on activities that are
not whitelisted for Content Capture.

Test: atest CtsContentCaptureServiceTestCases:android.contentcaptureservice.cts.LoginActivityTest#testSimpleLifecycle_defaultSession
Test: atest CtsContentCaptureServiceTestCases # sanity check
Test: m update-api

Bug: 126262658

Change-Id: Id2d4ccfb04d56eba561200d6875374a932c526ae

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 eba00812..e733830 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -87,6 +87,7 @@
 import com.android.server.camera.CameraServiceProxy;
 import com.android.server.clipboard.ClipboardService;
 import com.android.server.connectivity.IpConnectivityMetrics;
+import com.android.server.contentcapture.ContentCaptureManagerInternal;
 import com.android.server.coverage.CoverageService;
 import com.android.server.devicepolicy.DevicePolicyManagerService;
 import com.android.server.display.DisplayManagerService;
@@ -2250,6 +2251,13 @@
 
         traceBeginAndSlog("StartContentCaptureService");
         mSystemServiceManager.startService(CONTENT_CAPTURE_MANAGER_SERVICE_CLASS);
+
+        ContentCaptureManagerInternal ccmi =
+                LocalServices.getService(ContentCaptureManagerInternal.class);
+        if (ccmi != null && mActivityManagerService != null) {
+            mActivityManagerService.setContentCaptureManager(ccmi);
+        }
+
         traceEnd();
     }