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

Commit 37588b48 authored by Adam He's avatar Adam He Committed by android-build-merger
Browse files

Merge "Added documentation to note onDisconnected() should not make calls to... 

Merge "Added documentation to note onDisconnected() should not make calls to their respective managers." into qt-dev am: 168f7e48
am: 75062eaa

Change-Id: I18691dfc3bcaf9b68fe0b5633447802b5a333a42
parents dc2a23fd 75062eaa

core/java/android/service/autofill/AutofillService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -674,6 +674,8 @@ public abstract class AutofillService extends Service { 
     * Called when the Android system disconnects from the service.

     * Called when the Android system disconnects from the service.

     *

     *

     * <p> At this point this service may no longer be an active {@link AutofillService}.

     * <p> At this point this service may no longer be an active {@link AutofillService}.

     * It should not make calls on {@link AutofillManager} that requires the caller to be

     * the current service.

     */

     */

    public void onDisconnected() {

    public void onDisconnected() {

    }

    }

core/java/android/service/autofill/augmented/AugmentedAutofillService.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import android.util.Slog; 
import android.util.SparseArray;

import android.util.SparseArray;

import android.util.TimeUtils;

import android.util.TimeUtils;

import android.view.autofill.AutofillId;

import android.view.autofill.AutofillId;

import android.view.autofill.AutofillManager;

import android.view.autofill.AutofillValue;

import android.view.autofill.AutofillValue;

import android.view.autofill.IAugmentedAutofillManagerClient;

import android.view.autofill.IAugmentedAutofillManagerClient;

import android.view.autofill.IAutofillWindowPresenter;

import android.view.autofill.IAutofillWindowPresenter;
@@ -183,6 +184,8 @@ public abstract class AugmentedAutofillService extends Service { 
     * Called when the Android system disconnects from the service.

     * Called when the Android system disconnects from the service.

     *

     *

     * <p> At this point this service may no longer be an active {@link AugmentedAutofillService}.

     * <p> At this point this service may no longer be an active {@link AugmentedAutofillService}.

     * It should not make calls on {@link AutofillManager} that requires the caller to be

     * the current service.

     */

     */

    public void onDisconnected() {

    public void onDisconnected() {

    }

    }

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.IBinder;

import android.os.Looper;

import android.os.Looper;

import android.os.RemoteException;

import android.os.RemoteException;

import android.service.autofill.AutofillService;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.util.SparseIntArray;

import android.util.SparseIntArray;
@@ -350,7 +349,9 @@ public abstract class ContentCaptureService extends Service { 
    /**

    /**

     * Called when the Android system disconnects from the service.

     * Called when the Android system disconnects from the service.

     *

     *

     * <p> At this point this service may no longer be an active {@link AutofillService}.

     * <p> At this point this service may no longer be an active {@link ContentCaptureService}.

     * It should not make calls on {@link ContentCaptureManager} that requires the caller to be

     * the current service.

     */

     */

    public void onDisconnected() {

    public void onDisconnected() {

        Slog.i(TAG, "unbinding from " + getClass().getName());

        Slog.i(TAG, "unbinding from " + getClass().getName());