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

Commit cc83ea79 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "Make flags related for "external services" public"

parents 62d59cc4 278fb3b3

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -8088,6 +8088,7 @@ package android.content { 
    field public static final int BIND_ALLOW_OOM_MANAGEMENT = 16; // 0x10

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

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

    field public static final int BIND_EXTERNAL_SERVICE = -2147483648; // 0x80000000

    field public static final int BIND_IMPORTANT = 64; // 0x40

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

    field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20
@@ -9943,6 +9944,7 @@ package android.content.pm { 
    method public int describeContents();

    method public void dump(android.util.Printer, java.lang.String);

    field public static final android.os.Parcelable.Creator<android.content.pm.ServiceInfo> CREATOR;

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

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

    field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10346,6 +10346,7 @@ package android.content.pm { 
    method public int describeContents();

    method public void dump(android.util.Printer, java.lang.String);

    field public static final android.os.Parcelable.Creator<android.content.pm.ServiceInfo> CREATOR;

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

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

    field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000

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

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -8092,6 +8092,7 @@ package android.content { 
    field public static final int BIND_ALLOW_OOM_MANAGEMENT = 16; // 0x10

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

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

    field public static final int BIND_EXTERNAL_SERVICE = -2147483648; // 0x80000000

    field public static final int BIND_IMPORTANT = 64; // 0x40

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

    field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20
@@ -9951,6 +9952,7 @@ package android.content.pm { 
    method public int describeContents();

    method public void dump(android.util.Printer, java.lang.String);

    field public static final android.os.Parcelable.Creator<android.content.pm.ServiceInfo> CREATOR;

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

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

    field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000

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

core/java/android/content/Context.java

+0 −2
Original line number Diff line number Diff line
@@ -342,9 +342,7 @@ public abstract class Context { 
     * {@link android.R.attr#isolatedProcess isolated},

     * {@link android.R.attr#externalService external} service.  This binds the service into the

     * calling application's package, rather than the package in which the service is declared.

     * @hide

     */

    @SystemApi

    public static final int BIND_EXTERNAL_SERVICE = 0x80000000;



    /**

core/java/android/content/pm/ServiceInfo.java

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ public class ServiceInfo extends ComponentInfo 
     * Bit in {@link #flags}: If set, the service can be bound and run in the

     * calling application's package, rather than the package in which it is

     * declared.  Set from {@link android.R.attr#externalService} attribute.

     * @hide

     */

    public static final int FLAG_EXTERNAL_SERVICE = 0x0004;