Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4439ee66 authored by Felipe Leme's avatar Felipe Leme
Browse files

Renamed UserDataRemovalRequest to DataRemovalRequest. 

Test: m update-api
Test: atest CtsContentCaptureServiceTestCases

Bug: 130726495

Change-Id: I691b9de40863421395e910f6e28186d8a91b08f2
parent 4ac921f5

api/current.txt

+10 −10
Original line number Diff line number Diff line
@@ -52849,7 +52849,7 @@ package android.view.contentcapture { 
    method @Nullable public java.util.Set<android.view.contentcapture.ContentCaptureCondition> getContentCaptureConditions();

    method @Nullable public android.content.ComponentName getServiceComponentName();

    method public boolean isContentCaptureEnabled();

    method public void removeUserData(@NonNull android.view.contentcapture.UserDataRemovalRequest);

    method public void removeData(@NonNull android.view.contentcapture.DataRemovalRequest);

    method public void setContentCaptureEnabled(boolean);

  }









@@ -52874,24 +52874,24 @@ package android.view.contentcapture {













    field @NonNull public static final android.os.Parcelable.Creator<android.view.contentcapture.ContentCaptureSessionId> CREATOR;















  }



























  public final class UserDataRemovalRequest implements android.os.Parcelable {













  public final class DataRemovalRequest implements android.os.Parcelable {















    method public int describeContents();













    method @NonNull public java.util.List<android.view.contentcapture.UserDataRemovalRequest.LocusIdRequest> getLocusIdRequests();













    method @NonNull public java.util.List<android.view.contentcapture.DataRemovalRequest.LocusIdRequest> getLocusIdRequests();















    method @NonNull public String getPackageName();















    method public boolean isForEverything();















    method public void writeToParcel(android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.view.contentcapture.UserDataRemovalRequest> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.view.contentcapture.DataRemovalRequest> CREATOR;















    field public static final int FLAG_IS_PREFIX = 1; // 0x1















  }



























  public static final class UserDataRemovalRequest.Builder {













    ctor public UserDataRemovalRequest.Builder();













    method @NonNull public android.view.contentcapture.UserDataRemovalRequest.Builder addLocusId(@NonNull android.content.LocusId, int);













    method @NonNull public android.view.contentcapture.UserDataRemovalRequest build();













    method @NonNull public android.view.contentcapture.UserDataRemovalRequest.Builder forEverything();













  public static final class DataRemovalRequest.Builder {













    ctor public DataRemovalRequest.Builder();













    method @NonNull public android.view.contentcapture.DataRemovalRequest.Builder addLocusId(@NonNull android.content.LocusId, int);













    method @NonNull public android.view.contentcapture.DataRemovalRequest build();













    method @NonNull public android.view.contentcapture.DataRemovalRequest.Builder forEverything();















  }



























  public final class UserDataRemovalRequest.LocusIdRequest {













  public final class DataRemovalRequest.LocusIdRequest {















    method @NonNull public int getFlags();















    method @NonNull public android.content.LocusId getLocusId();















  }

























api/system-current.txt



+1
−1






























Original line number
Diff line number
Diff line








@@ -6379,9 +6379,9 @@ package android.service.contentcapture {













    method public void onConnected();















    method public void onContentCaptureEvent(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.view.contentcapture.ContentCaptureEvent);















    method public void onCreateContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext, @NonNull android.view.contentcapture.ContentCaptureSessionId);













    method public void onDataRemovalRequest(@NonNull android.view.contentcapture.DataRemovalRequest);















    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);















    method public void onDisconnected();













    method public void onUserDataRemovalRequest(@NonNull android.view.contentcapture.UserDataRemovalRequest);















    method public final void setContentCaptureConditions(@NonNull String, @Nullable java.util.Set<android.view.contentcapture.ContentCaptureCondition>);















    method public final void setContentCaptureWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);















    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";

































api/test-current.txt



+1
−1






























Original line number
Diff line number
Diff line








@@ -2541,9 +2541,9 @@ package android.service.contentcapture {













    method public void onConnected();















    method public void onContentCaptureEvent(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.view.contentcapture.ContentCaptureEvent);















    method public void onCreateContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext, @NonNull android.view.contentcapture.ContentCaptureSessionId);













    method public void onDataRemovalRequest(@NonNull android.view.contentcapture.DataRemovalRequest);















    method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);















    method public void onDisconnected();













    method public void onUserDataRemovalRequest(@NonNull android.view.contentcapture.UserDataRemovalRequest);















    method public final void setContentCaptureConditions(@NonNull String, @Nullable java.util.Set<android.view.contentcapture.ContentCaptureCondition>);















    method public final void setContentCaptureWhitelist(@Nullable java.util.Set<java.lang.String>, @Nullable java.util.Set<android.content.ComponentName>);















    field public static final String SERVICE_INTERFACE = "android.service.contentcapture.ContentCaptureService";

































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



+10
−12






























Original line number
Diff line number
Diff line








@@ -46,9 +46,9 @@ import android.view.contentcapture.ContentCaptureEvent;













import android.view.contentcapture.ContentCaptureManager;















import android.view.contentcapture.ContentCaptureSession;















import android.view.contentcapture.ContentCaptureSessionId;













import android.view.contentcapture.DataRemovalRequest;















import android.view.contentcapture.IContentCaptureDirectManager;















import android.view.contentcapture.MainContentCaptureSession;













import android.view.contentcapture.UserDataRemovalRequest;































import com.android.internal.os.IResultReceiver;


























@@ -155,9 +155,8 @@ public abstract class ContentCaptureService extends Service {













        }































        @Override













        public void onUserDataRemovalRequest(UserDataRemovalRequest request) {













            mHandler.sendMessage(













                    obtainMessage(ContentCaptureService::handleOnUserDataRemovalRequest,













        public void onDataRemovalRequest(DataRemovalRequest request) {













            mHandler.sendMessage(obtainMessage(ContentCaptureService::handleOnDataRemovalRequest,















                    ContentCaptureService.this, request));















        }

























@@ -165,7 +164,6 @@ public abstract class ContentCaptureService extends Service {













        public void onActivityEvent(ActivityEvent event) {















            mHandler.sendMessage(obtainMessage(ContentCaptureService::handleOnActivityEvent,















                    ContentCaptureService.this, event));





























        }















    };


























@@ -305,12 +303,12 @@ public abstract class ContentCaptureService extends Service {













    }































    /**













     * Notifies the service that the app requested to remove data associated with the user.













     * Notifies the service that the app requested to remove content capture data.















     *













     * @param request the user data requested to be removed













     * @param request the content capture data requested to be removed















     */













    public void onUserDataRemovalRequest(@NonNull UserDataRemovalRequest request) {













        if (sVerbose) Log.v(TAG, "onUserDataRemovalRequest()");













    public void onDataRemovalRequest(@NonNull DataRemovalRequest request) {













        if (sVerbose) Log.v(TAG, "onDataRemovalRequest()");















    }































    /**










@@ -466,8 +464,8 @@ public abstract class ContentCaptureService extends Service {













        onDestroyContentCaptureSession(new ContentCaptureSessionId(sessionId));















    }





























    private void handleOnUserDataRemovalRequest(@NonNull UserDataRemovalRequest request) {













        onUserDataRemovalRequest(request);













    private void handleOnDataRemovalRequest(@NonNull DataRemovalRequest request) {













        onDataRemovalRequest(request);















    }































    private void handleOnActivityEvent(@NonNull ActivityEvent event) {

































core/java/android/service/contentcapture/IContentCaptureService.aidl



+2
−2






























Original line number
Diff line number
Diff line








@@ -21,7 +21,7 @@ import android.os.IBinder;













import android.service.contentcapture.ActivityEvent;















import android.service.contentcapture.SnapshotData;















import android.view.contentcapture.ContentCaptureContext;













import android.view.contentcapture.UserDataRemovalRequest;













import android.view.contentcapture.DataRemovalRequest;































import com.android.internal.os.IResultReceiver;

























@@ -39,6 +39,6 @@ oneway interface IContentCaptureService {













                          in IResultReceiver clientReceiver, int initialState);















    void onSessionFinished(int sessionId);















    void onActivitySnapshot(int sessionId, in SnapshotData snapshotData);













    void onUserDataRemovalRequest(in UserDataRemovalRequest request);













    void onDataRemovalRequest(in DataRemovalRequest request);















    void onActivityEvent(in ActivityEvent event);















}