Merge change 23868 into eclair (ebf0bbaa) · Commits · e / os / android_frameworks_base

api/current.xml

+109 −0

Original line number	Diff line number	Diff line
		@@ -17373,6 +17373,21 @@
		visibility="public"
		>
		</method>
		<method name="getRunningServiceControlPanel"
		return="android.app.PendingIntent"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="service" type="android.content.ComponentName">
		</parameter>
		<exception name="SecurityException" type="java.lang.SecurityException">
		</exception>
		</method>
		<method name="getRunningServices"
		return="java.util.List<android.app.ActivityManager.RunningServiceInfo>"
		abstract="false"
		@@ -17942,6 +17957,39 @@
		visibility="public"
		>
		</field>
		<field name="REASON_PROVIDER_IN_USE"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="REASON_SERVICE_IN_USE"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="REASON_UNKNOWN"
		type="int"
		transient="false"
		volatile="false"
		value="0"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="importance"
		type="int"
		transient="false"
		@@ -17952,6 +18000,36 @@
		visibility="public"
		>
		</field>
		<field name="importanceReasonCode"
		type="int"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="importanceReasonComponent"
		type="android.content.ComponentName"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="importanceReasonPid"
		type="int"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="lru"
		type="int"
		transient="false"
		@@ -18125,6 +18203,26 @@
		visibility="public"
		>
		</field>
		<field name="clientLabel"
		type="int"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="clientPackage"
		type="java.lang.String"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="crashCount"
		type="int"
		transient="false"
		@@ -112103,6 +112201,17 @@
		visibility="public"
		>
		</constructor>
		<field name="ACTION_ACCESSIBILITY_SETTINGS"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.settings.ACCESSIBILITY_SETTINGS""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_AIRPLANE_MODE_SETTINGS"
		type="java.lang.String"
		transient="false"

core/java/android/app/ActivityManager.java

+82 −0

Original line number	Diff line number	Diff line
		@@ -366,6 +366,19 @@ public class ActivityManager {
		*/
		public int flags;

		/**
		* For special services that are bound to by system code, this is
		* the package that holds the binding.
		*/
		public String clientPackage;

		/**
		* For special services that are bound to by system code, this is
		* a string resource providing a user-visible label for who the
		* client is.
		*/
		public int clientLabel;

		public RunningServiceInfo() {
		}

		@@ -386,6 +399,8 @@ public class ActivityManager {
		dest.writeLong(lastActivityTime);
		dest.writeLong(restarting);
		dest.writeInt(this.flags);
		dest.writeString(clientPackage);
		dest.writeInt(clientLabel);
		}

		public void readFromParcel(Parcel source) {
		@@ -401,6 +416,8 @@ public class ActivityManager {
		lastActivityTime = source.readLong();
		restarting = source.readLong();
		flags = source.readInt();
		clientPackage = source.readString();
		clientLabel = source.readInt();
		}

		public static final Creator<RunningServiceInfo> CREATOR = new Creator<RunningServiceInfo>() {
		@@ -438,6 +455,22 @@ public class ActivityManager {
		}
		}

		/**
		* Returns a PendingIntent you can start to show a control panel for the
		* given running service. If the service does not have a control panel,
		* null is returned.
		*/
		public PendingIntent getRunningServiceControlPanel(ComponentName service)
		throws SecurityException {
		try {
		return ActivityManagerNative.getDefault()
		.getRunningServiceControlPanel(service);
		} catch (RemoteException e) {
		// System dead, we will be dead too soon!
		return null;
		}
		}

		/**
		* Information you can retrieve about the available memory through
		* {@link ActivityManager#getMemoryInfo}.
		@@ -704,8 +737,51 @@ public class ActivityManager {
		*/
		public int lru;

		/**
		* Constant for {@link #importanceReasonCode}: nothing special has
		* been specified for the reason for this level.
		*/
		public static final int REASON_UNKNOWN = 0;

		/**
		* Constant for {@link #importanceReasonCode}: one of the application's
		* content providers is being used by another process. The pid of
		* the client process is in {@link #importanceReasonPid} and the
		* target provider in this process is in
		* {@link #importanceReasonComponent}.
		*/
		public static final int REASON_PROVIDER_IN_USE = 1;

		/**
		* Constant for {@link #importanceReasonCode}: one of the application's
		* content providers is being used by another process. The pid of
		* the client process is in {@link #importanceReasonPid} and the
		* target provider in this process is in
		* {@link #importanceReasonComponent}.
		*/
		public static final int REASON_SERVICE_IN_USE = 2;

		/**
		* The reason for {@link #importance}, if any.
		*/
		public int importanceReasonCode;

		/**
		* For the specified values of {@link #importanceReasonCode}, this
		* is the process ID of the other process that is a client of this
		* process. This will be 0 if no other process is using this one.
		*/
		public int importanceReasonPid;

		/**
		* For the specified values of {@link #importanceReasonCode}, this
		* is the name of the component that is being used in this process.
		*/
		public ComponentName importanceReasonComponent;

		public RunningAppProcessInfo() {
		importance = IMPORTANCE_FOREGROUND;
		importanceReasonCode = REASON_UNKNOWN;
		}

		public RunningAppProcessInfo(String pProcessName, int pPid, String pArr[]) {
		@@ -724,6 +800,9 @@ public class ActivityManager {
		dest.writeStringArray(pkgList);
		dest.writeInt(importance);
		dest.writeInt(lru);
		dest.writeInt(importanceReasonCode);
		dest.writeInt(importanceReasonPid);
		ComponentName.writeToParcel(importanceReasonComponent, dest);
		}

		public void readFromParcel(Parcel source) {
		@@ -732,6 +811,9 @@ public class ActivityManager {
		pkgList = source.readStringArray();
		importance = source.readInt();
		lru = source.readInt();
		importanceReasonCode = source.readInt();
		importanceReasonPid = source.readInt();
		importanceReasonComponent = ComponentName.readFromParcel(source);
		}

		public static final Creator<RunningAppProcessInfo> CREATOR =

core/java/android/app/ActivityManagerNative.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -510,6 +510,15 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		return true;
		}

		case GET_RUNNING_SERVICE_CONTROL_PANEL_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		ComponentName comp = ComponentName.CREATOR.createFromParcel(data);
		PendingIntent pi = getRunningServiceControlPanel(comp);
		reply.writeNoException();
		PendingIntent.writePendingIntentOrNullToParcel(pi, reply);
		return true;
		}

		case START_SERVICE_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		IBinder b = data.readStrongBinder();
		@@ -1634,6 +1643,21 @@ class ActivityManagerProxy implements IActivityManager
		reply.recycle();
		}

		public PendingIntent getRunningServiceControlPanel(ComponentName service)
		throws RemoteException
		{
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		service.writeToParcel(data, 0);
		mRemote.transact(GET_RUNNING_SERVICE_CONTROL_PANEL_TRANSACTION, data, reply, 0);
		reply.readException();
		PendingIntent res = PendingIntent.readPendingIntentOrNullFromParcel(reply);
		data.recycle();
		reply.recycle();
		return res;
		}

		public ComponentName startService(IApplicationThread caller, Intent service,
		String resolvedType) throws RemoteException
		{

core/java/android/app/IActivityManager.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -133,6 +133,8 @@ public interface IActivityManager extends IInterface {
		String name) throws RemoteException;
		public void publishContentProviders(IApplicationThread caller,
		List<ContentProviderHolder> providers) throws RemoteException;
		public PendingIntent getRunningServiceControlPanel(ComponentName service)
		throws RemoteException;
		public ComponentName startService(IApplicationThread caller, Intent service,
		String resolvedType) throws RemoteException;
		public int stopService(IApplicationThread caller, Intent service,
		@@ -367,7 +369,7 @@ public interface IActivityManager extends IInterface {
		int PUBLISH_CONTENT_PROVIDERS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+29;
		int SET_PERSISTENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+30;
		int FINISH_SUB_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+31;

		int GET_RUNNING_SERVICE_CONTROL_PANEL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+32;
		int START_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+33;
		int STOP_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+34;
		int BIND_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+35;

core/java/android/content/Intent.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -2044,6 +2044,24 @@ public class Intent implements Parcelable {
		public static final String EXTRA_CHANGED_COMPONENT_NAME =
		"android.intent.extra.changed_component_name";

		/**
		* @hide
		* Magic extra system code can use when binding, to give a label for
		* who it is that has bound to a service. This is an integer giving
		* a framework string resource that can be displayed to the user.
		*/
		public static final String EXTRA_CLIENT_LABEL =
		"android.intent.extra.client_label";

		/**
		* @hide
		* Magic extra system code can use when binding, to give a PendingIntent object
		* that can be launched for the user to disable the system's use of this
		* service.
		*/
		public static final String EXTRA_CLIENT_INTENT =
		"android.intent.extra.client_intent";

		// ---------------------------------------------------------------------
		// ---------------------------------------------------------------------
		// Intent flags (see mFlags variable).