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

Commit 278fb3b3 authored Feb 03, 2016 by Mikhail Naganov

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

parent 574460f5

api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8085,6 +8085,7 @@ package android.content {
	field public static final int BIND_ALLOW_OOM_MANAGEMENT = 16; // 0x10		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_AUTO_CREATE = 1; // 0x1
	field public static final int BIND_DEBUG_UNBIND = 2; // 0x2		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_IMPORTANT = 64; // 0x40
	field public static final int BIND_NOT_FOREGROUND = 4; // 0x4		field public static final int BIND_NOT_FOREGROUND = 4; // 0x4
	field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20		field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20
	@@ -9940,6 +9941,7 @@ package android.content.pm {
	method public int describeContents();		method public int describeContents();
	method public void dump(android.util.Printer, java.lang.String);		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 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_ISOLATED_PROCESS = 2; // 0x2
	field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000		field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000
	field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1		field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10341,6 +10341,7 @@ package android.content.pm {
	method public int describeContents();		method public int describeContents();
	method public void dump(android.util.Printer, java.lang.String);		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 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_ISOLATED_PROCESS = 2; // 0x2
	field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000		field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000
	field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1		field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1

api/test-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8089,6 +8089,7 @@ package android.content {
	field public static final int BIND_ALLOW_OOM_MANAGEMENT = 16; // 0x10		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_AUTO_CREATE = 1; // 0x1
	field public static final int BIND_DEBUG_UNBIND = 2; // 0x2		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_IMPORTANT = 64; // 0x40
	field public static final int BIND_NOT_FOREGROUND = 4; // 0x4		field public static final int BIND_NOT_FOREGROUND = 4; // 0x4
	field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20		field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20
	@@ -9948,6 +9949,7 @@ package android.content.pm {
	method public int describeContents();		method public int describeContents();
	method public void dump(android.util.Printer, java.lang.String);		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 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_ISOLATED_PROCESS = 2; // 0x2
	field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000		field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000
	field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1		field public static final int FLAG_STOP_WITH_TASK = 1; // 0x1

core/java/android/content/Context.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -342,9 +342,7 @@ public abstract class Context {
	* {@link android.R.attr#isolatedProcess isolated},		* {@link android.R.attr#isolatedProcess isolated},
	* {@link android.R.attr#externalService external} service. This binds the service into the		* {@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.		* calling application's package, rather than the package in which the service is declared.
	* @hide
	*/		*/
	@SystemApi
	public static final int BIND_EXTERNAL_SERVICE = 0x80000000;		public static final int BIND_EXTERNAL_SERVICE = 0x80000000;

	/**		/**

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

+0 −1

Original line number	Original line	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		* 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		* calling application's package, rather than the package in which it is
	* declared. Set from {@link android.R.attr#externalService} attribute.		* declared. Set from {@link android.R.attr#externalService} attribute.
	* @hide
	*/		*/
	public static final int FLAG_EXTERNAL_SERVICE = 0x0004;		public static final int FLAG_EXTERNAL_SERVICE = 0x0004;