Merge "Fixed javadoc for View.setContentCaptureSession()." into qt-dev

core/java/android/view/View.java

@@ -9076,18 +9076,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      * <pre>
      *   ContentCaptureSession mainSession = rootView.getContentCaptureSession();
      *   mainSession.setContentCaptureContext(ContentCaptureContext.forLocusId(Uri.parse(myUrl));
-     * <pre>
+     * </pre>
      *
      * <p>Then if the page had an {@code IFRAME}, you would create a new session for it:
      *
-     * <p>For example, if your activity is associated with a web domain, you could create a session
-     * {@code onCreate()} and associate it with the root view of the activity:
-     *
      * <pre>
      *   ContentCaptureSession iframeSession = mainSession.createContentCaptureSession(
      *       ContentCaptureContext.forLocusId(Uri.parse(iframeUrl)));
      *   iframeView.setContentCaptureSession(iframeSession);
-     * <pre>
+     * </pre>
      *
      * @param contentCaptureSession a session created by
      * {@link ContentCaptureSession#createContentCaptureSession(

core/java/android/view/contentcapture/ContentCaptureSession.java

@@ -41,7 +41,7 @@ import java.util.ArrayList;
 import java.util.Random;
 
 /**
- * Session used to notify the Android system about events associated with views.
+ * Session used when notifying the Android system about events associated with views.
  */
 public abstract class ContentCaptureSession implements AutoCloseable {
 

core/java/android/view/contentcapture/DataRemovalRequest.java

@@ -32,6 +32,9 @@ import java.util.List;
 
 /**
  * Class used by apps to remove content capture data associated with {@link LocusId LocusIds}.
+ *
+ * <p>An app which has tagged data with a LocusId can therefore delete them later. This is intended
+ * to let apps propagate deletions of user data into the operating system.
  */
 public final class DataRemovalRequest implements Parcelable {