commit 62e45b0c4b8f46a8f5ff1bc05cf19893d6dfde0e
author Felipe Leme <felipeal@google.com> Thu Jan 10 10:22:00 2019 -0800
committer Felipe Leme <felipeal@google.com> Thu Jan 10 10:34:02 2019 -0800
tree cf2ed929099264874eaf11028b4cf1e97f760f0c
parent 767fa0d205362f04a802722509d0c2becdaf7f74

Defined a new ContentCapture API: ContentCaptureService.onUserDataRemovalRequest

Test: m update-api

Bug: 121289354
Bug: 117944706

Change-Id: Ie317c170b49cdf6671dd0c4eadf02380cd737bf0

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index cb1e96a..1113f53 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5249,6 +5249,7 @@
     method public void onCreateContentCaptureSession(android.view.contentcapture.ContentCaptureContext, android.view.contentcapture.ContentCaptureSessionId);
     method public void onDestroyContentCaptureSession(android.view.contentcapture.ContentCaptureSessionId);
     method public void onDisconnected();
+    method public void onUserDataRemovalRequest(android.view.contentcapture.UserDataRemovalRequest);
     method public final void setActivityContentCaptureEnabled(android.content.ComponentName, boolean);
     method public final void setContentCaptureWhitelist(java.util.List<java.lang.String>, java.util.List<android.content.ComponentName>);
     method public final void setPackageContentCaptureEnabled(java.lang.String, boolean);

core/java/android/service/contentcapture/ContentCaptureService.java

diff --git a/core/java/android/service/contentcapture/ContentCaptureService.java b/core/java/android/service/contentcapture/ContentCaptureService.java
index 26bf361..4b7f329 100644
--- a/core/java/android/service/contentcapture/ContentCaptureService.java
+++ b/core/java/android/service/contentcapture/ContentCaptureService.java
@@ -42,6 +42,7 @@
 import android.view.contentcapture.ContentCaptureSessionId;
 import android.view.contentcapture.IContentCaptureDirectManager;
 import android.view.contentcapture.MainContentCaptureSession;
+import android.view.contentcapture.UserDataRemovalRequest;
 
 import com.android.internal.os.IResultReceiver;
 
@@ -255,6 +256,16 @@
         if (VERBOSE) Log.v(TAG, "onContentCaptureEventsRequest(id=" + sessionId + ")");
         onContentCaptureEventsRequest(sessionId, new ContentCaptureEventsRequest(event));
     }
+
+    /**
+     * Notifies the service that the app requested to remove data associated with the user.
+     *
+     * @param request the user data requested to be removed
+     */
+    public void onUserDataRemovalRequest(@NonNull UserDataRemovalRequest request) {
+        if (VERBOSE) Log.v(TAG, "onUserDataRemovalRequest()");
+    }
+
     /**
      * Notifies the service of {@link SnapshotData snapshot data} associated with a session.
      *