Ignore ContentCapture events after the activity stopped.
Test: atest CtsContentCaptureServiceTestCases
Bug: 121033016
Change-Id: I016f13748287f77b7c5f0ceb12a5af1bb2b555ea
diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java
index 92e0187..12c50ce 100644
--- a/core/java/android/view/contentcapture/MainContentCaptureSession.java
+++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java
@@ -219,7 +219,7 @@
/**
* Callback from {@code system_server} after call to
* {@link IContentCaptureManager#startSession(int, IBinder, ComponentName, String,
- * ContentCaptureContext, int, IResultReceiver)}.
+ * int, IResultReceiver)}.
*
* @param resultCode session state
* @param binder handle to {@code IContentCaptureDirectManager}
@@ -425,7 +425,8 @@
@Override
boolean isContentCaptureEnabled() {
- return mSystemServerInterface != null && !mDisabled.get();
+ return super.isContentCaptureEnabled() && mSystemServerInterface != null
+ && !mDisabled.get();
}
// TODO(b/121033016): refactor "notifyXXXX" methods below to a common "Buffer" object that is