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

Commit 2fad0b64 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK... 

Merge "Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK toolkit." into qt-dev am: 11141109" into qt-dev-plus-aosp
parents 843c0387 3e7ebd52

api/current.txt

+12 −20
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ package android { 
    field public static final int __removed3 = 16844187; // 0x101059b

    field public static final int __removed4 = 16844188; // 0x101059c

    field public static final int __removed5 = 16844189; // 0x101059d

    field public static final int __removed6 = 16844182; // 0x1010596

    field public static final int absListViewStyle = 16842858; // 0x101006a

    field public static final int accessibilityEventTypes = 16843648; // 0x1010380

    field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
@@ -750,7 +751,6 @@ package android { 
    field public static final int immersive = 16843456; // 0x10102c0

    field public static final int importantForAccessibility = 16843690; // 0x10103aa

    field public static final int importantForAutofill = 16844120; // 0x1010558

    field public static final int importantForContentCapture = 16844182; // 0x1010596

    field public static final int inAnimation = 16843127; // 0x1010177

    field public static final int includeFontPadding = 16843103; // 0x101015f

    field public static final int includeInGlobalSearch = 16843374; // 0x101026e
@@ -50207,7 +50207,6 @@ package android.view { 
    method @android.view.ViewDebug.CapturedViewProperty @IdRes public int getId();

    method @android.view.ViewDebug.ExportedProperty(category="accessibility", mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, to="noHideDescendants")}) public int getImportantForAccessibility();

    method @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS, to="yesExcludeDescendants"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS, to="noExcludeDescendants")}) public int getImportantForAutofill();

    method @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS, to="yesExcludeDescendants"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS, to="noExcludeDescendants")}) public int getImportantForContentCapture();

    method public boolean getKeepScreenOn();

    method public android.view.KeyEvent.DispatcherState getKeyDispatcherState();

    method @android.view.ViewDebug.ExportedProperty(category="accessibility") @IdRes public int getLabelFor();
@@ -50348,7 +50347,6 @@ package android.view { 
    method @android.view.ViewDebug.ExportedProperty public boolean isHovered();

    method public boolean isImportantForAccessibility();

    method public final boolean isImportantForAutofill();

    method public final boolean isImportantForContentCapture();

    method public boolean isInEditMode();

    method public boolean isInLayout();

    method @android.view.ViewDebug.ExportedProperty public boolean isInTouchMode();
@@ -50423,7 +50421,6 @@ package android.view { 
    method @CallSuper public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);

    method public void onProvideAutofillStructure(android.view.ViewStructure, int);

    method public void onProvideAutofillVirtualStructure(android.view.ViewStructure, int);

    method public void onProvideContentCaptureStructure(@NonNull android.view.ViewStructure, int);

    method public void onProvideStructure(android.view.ViewStructure);

    method public void onProvideVirtualStructure(android.view.ViewStructure);

    method public android.view.PointerIcon onResolvePointerIcon(android.view.MotionEvent, int);
@@ -50549,7 +50546,6 @@ package android.view { 
    method public void setId(@IdRes int);

    method public void setImportantForAccessibility(int);

    method public void setImportantForAutofill(int);

    method public void setImportantForContentCapture(int);

    method public void setKeepScreenOn(boolean);

    method public void setKeyboardNavigationCluster(boolean);

    method public void setLabelFor(@IdRes int);
@@ -50728,11 +50724,6 @@ package android.view { 
    field public static final int IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS = 8; // 0x8

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

    field public static final int IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS = 4; // 0x4

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_AUTO = 0; // 0x0

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO = 2; // 0x2

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS = 8; // 0x8

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

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS = 4; // 0x4

    field public static final int INVISIBLE = 4; // 0x4

    field public static final int KEEP_SCREEN_ON = 67108864; // 0x4000000

    field public static final int LAYER_TYPE_HARDWARE = 2; // 0x2
@@ -52840,7 +52831,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);

  }









@@ -52851,6 +52842,7 @@ package android.view.contentcapture {













    method @Nullable public final android.view.contentcapture.ContentCaptureContext getContentCaptureContext();















    method @NonNull public final android.view.contentcapture.ContentCaptureSessionId getContentCaptureSessionId();















    method @NonNull public android.view.autofill.AutofillId newAutofillId(@NonNull android.view.autofill.AutofillId, long);













    method @NonNull public final android.view.ViewStructure newViewStructure(@NonNull android.view.View);















    method @NonNull public final android.view.ViewStructure newVirtualViewStructure(@NonNull android.view.autofill.AutofillId, long);















    method public final void notifyViewAppeared(@NonNull android.view.ViewStructure);















    method public final void notifyViewDisappeared(@NonNull android.view.autofill.AutofillId);









@@ -52865,24 +52857,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








@@ -6395,9 +6395,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








@@ -2552,9 +2552,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



+8
−8






























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;


























@@ -138,7 +138,7 @@ public abstract class ContentCaptureService extends Service {













        }































        @Override













        public void onUserDataRemovalRequest(UserDataRemovalRequest request) {













        public void onDataRemovalRequest(DataRemovalRequest request) {















            mHandler.sendMessage(















                    obtainMessage(ContentCaptureService::handleOnUserDataRemovalRequest,















                            ContentCaptureService.this, request));










@@ -288,12 +288,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()");















    }































    /**










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













        onDestroyContentCaptureSession(new ContentCaptureSessionId(sessionId));















    }





























    private void handleOnUserDataRemovalRequest(@NonNull UserDataRemovalRequest request) {













        onUserDataRemovalRequest(request);













    private void handleOnUserDataRemovalRequest(@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);















}