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

Commit 033c0d99 authored by Jon Eckenrode's avatar Jon Eckenrode Committed by Automerger Merge Worker
Browse files

Merge "Added return value to overloaded bindService method." am: 59d082af... 

Merge "Added return value to overloaded bindService method." am: 59d082af am: 7756ed8d am: 2348bd2d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1995510

Change-Id: Ice2ac318fa773a406a416316e66e92bbca5b5b1e
parents 72f02ceb 2348bd2d

core/java/android/content/Context.java

+16 −10
Original line number Diff line number Diff line
@@ -3574,8 +3574,8 @@ public abstract class Context { 
     * @return {@code true} if the system is in the process of bringing up a

     *      service that your client has permission to bind to; {@code false}

     *      if the system couldn't find the service or if your client doesn't

     *         have permission to bind to it. You should call {@link #unbindService}

     *         to release the connection even if this method returned {@code false}.

     *      have permission to bind to it. Regardless of the return value, you

     *      should later call {@link #unbindService} to release the connection.

     *

     * @throws SecurityException If the caller does not have permission to

     *      access the service or the service cannot be found. Call
@@ -3589,10 +3589,16 @@ public abstract class Context { 
            @NonNull ServiceConnection conn, @BindServiceFlags int flags);



    /**

     * Same as {@link #bindService(Intent, ServiceConnection, int)} with executor to control

     * ServiceConnection callbacks.

     * Same as {@link #bindService(Intent, ServiceConnection, int)

     * bindService(Intent, ServiceConnection, int)} with executor to control ServiceConnection

     * callbacks.

     *

     * @param executor Callbacks on ServiceConnection will be called on executor. Must use same

     *      instance for the same instance of ServiceConnection.

     *

     * @return The result of the binding as described in

     *      {@link #bindService(Intent, ServiceConnection, int)

     *      bindService(Intent, ServiceConnection, int)}.

     */

    public boolean bindService(@RequiresPermission @NonNull Intent service,

            @BindServiceFlags int flags, @NonNull @CallbackExecutor Executor executor,
@@ -3618,12 +3624,13 @@ public abstract class Context { 
     * @param instanceName Unique identifier for the service instance.  Each unique

     *      name here will result in a different service instance being created.  Identifiers

     *      must only contain ASCII letters, digits, underscores, and periods.

     * @return Returns success of binding as per {@link #bindService}.

     * @param executor Callbacks on ServiceConnection will be called on executor.

     *      Must use same instance for the same instance of ServiceConnection.

     * @param conn Receives information as the service is started and stopped.

     *      This must be a valid ServiceConnection object; it must not be null.

     *

     * @return Returns success of binding as per {@link #bindService}.

     *

     * @throws SecurityException If the caller does not have permission to access the service

     * @throws IllegalArgumentException If the instanceName is invalid.

     *
@@ -3638,8 +3645,7 @@ public abstract class Context { 
    }



    /**

     * Binds to a service in the given {@code user} in the same manner as

     * {@link #bindService(Intent, ServiceConnection, int)}.

     * Binds to a service in the given {@code user} in the same manner as {@link #bindService}.

     *

     * <p>Requires that one of the following conditions are met:

     * <ul>