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

Commit e6f86a34 authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Renamed ContentCaptureService.disableContentCaptureServices to disableSelf()"

parents 758a998c bedcd617

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6435,7 +6435,7 @@ package android.service.contentcapture { 














  public abstract class ContentCaptureService extends android.app.Service {















    ctor public ContentCaptureService();













    method public final void disableContentCaptureServices();













    method public final void disableSelf();















    method public void onActivityEvent(@NonNull android.service.contentcapture.ActivityEvent);















    method public void onActivitySnapshot(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.service.contentcapture.SnapshotData);















    method public void onConnected();

































api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -2440,7 +2440,7 @@ package android.service.contentcapture {





























  public abstract class ContentCaptureService extends android.app.Service {















    ctor public ContentCaptureService();













    method public final void disableContentCaptureServices();













    method public final void disableSelf();















    method public void onActivityEvent(@NonNull android.service.contentcapture.ActivityEvent);















    method public void onActivitySnapshot(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.service.contentcapture.SnapshotData);















    method public void onConnected();

































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



+3
−3




























Original line number
Diff line number
Diff line








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













    /**















     * Disables the Content Capture service for the given user.















     */













    public final void disableContentCaptureServices() {













        if (sDebug) Log.d(TAG, "disableContentCaptureServices()");













    public final void disableSelf() {













        if (sDebug) Log.d(TAG, "disableSelf()");































        final IContentCaptureServiceCallback callback = mCallback;















        if (callback == null) {













            Log.w(TAG, "disableContentCaptureServices(): no server callback");













            Log.w(TAG, "disableSelf(): no server callback");















            return;















        }















        try {