From 278fb3b35920cd7d5ba4ce3a4c24776e89007bbd Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Wed, 3 Feb 2016 16:00:31 -0800 Subject: [PATCH] Make flags related for "external services" public ServiceInfo.FLAG_EXTERNAL_SERVICE is set when the service is exported with the new public manifest attribute "android:externalService" Context.BIND_EXTERNAL_SERVICE is used by clients when they are binding such service. Bug: 22084679 Bug: 21643067 Change-Id: Ifd708f90b47a1571cd54c5ec9fc217f0567d5ff4 --- api/current.txt | 2 ++ api/system-current.txt | 1 + api/test-current.txt | 2 ++ core/java/android/content/Context.java | 2 -- core/java/android/content/pm/ServiceInfo.java | 1 - 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index f9d0740c4e693..274de7cefc91f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8085,6 +8085,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 @@ -9940,6 +9941,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 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 diff --git a/api/system-current.txt b/api/system-current.txt index e4c9fc8866c2a..a6c2222a1fbc3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10341,6 +10341,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 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 diff --git a/api/test-current.txt b/api/test-current.txt index 6d5dd34570a7c..a737df745533b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -8089,6 +8089,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 @@ -9948,6 +9949,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 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 diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 622aad9c98bf6..4918914ec9d52 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -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; /** diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java index eecf0de5afa85..6bd285a6c3942 100644 --- a/core/java/android/content/pm/ServiceInfo.java +++ b/core/java/android/content/pm/ServiceInfo.java @@ -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;