| commit | 696fcca53f2376d4e4d95b8b77acc7483c3f8d97 | [log] [tgz] |
|---|---|---|
| author | Ahaan Ugale <augale@google.com> | Mon Jan 31 20:58:57 2022 +0000 |
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | Mon Jan 31 20:58:57 2022 +0000 |
| tree | 43d3e2c2082cd9906738733ec23ab44d2059eb74 | |
| parent | 9a191546d16431fef850e852f95b68ac85590c21 [diff] | |
| parent | 93debeaead56e276a6b8d041de644e3c7dad72ff [diff] |
[automerge] Fix Activity leak from ContentCapture Context-Updated event. 2p: 93debeaead Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16764050 Bug: 204891006 Change-Id: I3fa393e9f8e78b1e237ceed70e004949a7defe8c
diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java index cc47f09..a4db840 100644 --- a/core/java/android/view/contentcapture/ContentCaptureSession.java +++ b/core/java/android/view/contentcapture/ContentCaptureSession.java
@@ -290,6 +290,8 @@ * <p>Typically used to change the context associated with the default session from an activity. */ public final void setContentCaptureContext(@Nullable ContentCaptureContext context) { + if (!isContentCaptureEnabled()) return; + mClientContext = context; updateContentCaptureContext(context); }