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

Commit dfd60f68 authored by Andrew Solovay's avatar Andrew Solovay Committed by Automerger Merge Worker
Browse files

Merge "docs: Fixing typos in Context refdoc" into udc-dev am: 6afdda2f am:... 

Merge "docs: Fixing typos in Context refdoc" into udc-dev am: 6afdda2f am: 4711ed61 am: 68d7d185

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



Change-Id: Iabf1e3b853518955b4385615a5a1aca3f6273d02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff09409f 68d7d185

core/java/android/content/Context.java

+2 −2
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ public abstract class Context { 
     * If binding from a top app and its target SDK version is at or above

     * {@link android.os.Build.VERSION_CODES#R}, the app needs to

     * explicitly use BIND_INCLUDE_CAPABILITIES flag to pass all capabilities to the service so the

     * other app can have while-use-use access such as location, camera, microphone from background.

     * other app can have while-in-use access such as location, camera, microphone from background.

     * If binding from a top app and its target SDK version is below

     * {@link android.os.Build.VERSION_CODES#R}, BIND_INCLUDE_CAPABILITIES is implicit.

     */
@@ -678,7 +678,7 @@ public abstract class Context { 
     * </p>

     *

     * <em>This flag is NOT compatible with {@link BindServiceFlags}. If you need to use

     * {@link BindServiceFlags}, you must use {@link #BIND_EXTERNAL_SERVICE_LONG} instead.

     * {@link BindServiceFlags}, you must use {@link #BIND_EXTERNAL_SERVICE_LONG} instead.</em>

     */

    public static final int BIND_EXTERNAL_SERVICE = 0x80000000;