Merge change 23403 into eclair (d31825c6) · Commits · e / os / android_frameworks_base

api/current.xml

+115 −0

Original line number	Diff line number	Diff line
		@@ -18039,6 +18039,50 @@
		visibility="public"
		>
		</field>
		<field name="FLAG_FOREGROUND"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_PERSISTENT_PROCESS"
		type="int"
		transient="false"
		volatile="false"
		value="8"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_STARTED"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_SYSTEM_PROCESS"
		type="int"
		transient="false"
		volatile="false"
		value="4"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="activeSince"
		type="long"
		transient="false"
		@@ -18069,6 +18113,16 @@
		visibility="public"
		>
		</field>
		<field name="flags"
		type="int"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="foreground"
		type="boolean"
		transient="false"
		@@ -18139,6 +18193,16 @@
		visibility="public"
		>
		</field>
		<field name="uid"
		type="int"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="ActivityManager.RunningTaskInfo"
		extends="java.lang.Object"
		@@ -97544,6 +97608,8 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="android.os.Parcelable">
		</implements>
		<constructor name="Debug.MemoryInfo"
		type="android.os.Debug.MemoryInfo"
		static="false"
		@@ -97552,6 +97618,55 @@
		visibility="public"
		>
		</constructor>
		<method name="describeContents"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="readFromParcel"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="source" type="android.os.Parcel">
		</parameter>
		</method>
		<method name="writeToParcel"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="dest" type="android.os.Parcel">
		</parameter>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		<field name="CREATOR"
		type="android.os.Parcelable.Creator"
		transient="false"
		volatile="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="dalvikPrivateDirty"
		type="int"
		transient="false"

core/java/android/app/ActivityManager.java

+39 −1

Original line number	Diff line number	Diff line
		@@ -288,6 +288,11 @@ public class ActivityManager {
		*/
		public int pid;

		/**
		* The UID that owns this service.
		*/
		public int uid;

		/**
		* The name of the process this service runs in.
		*/
		@@ -299,7 +304,7 @@ public class ActivityManager {
		public boolean foreground;

		/**
		* The time when the service was first made activity, either by someone
		* The time when the service was first made active, either by someone
		* starting or binding to it.
		*/
		public long activeSince;
		@@ -332,6 +337,35 @@ public class ActivityManager {
		*/
		public long restarting;

		/**
		* Bit for {@link #flags}: set if this service has been
		* explicitly started.
		*/
		public static final int FLAG_STARTED = 1<<0;

		/**
		* Bit for {@link #flags}: set if the service has asked to
		* run as a foreground process.
		*/
		public static final int FLAG_FOREGROUND = 1<<1;

		/**
		* Bit for {@link #flags): set if the service is running in a
		* core system process.
		*/
		public static final int FLAG_SYSTEM_PROCESS = 1<<2;

		/**
		* Bit for {@link #flags): set if the service is running in a
		* persistent process.
		*/
		public static final int FLAG_PERSISTENT_PROCESS = 1<<3;

		/**
		* Running flags.
		*/
		public int flags;

		public RunningServiceInfo() {
		}

		@@ -342,6 +376,7 @@ public class ActivityManager {
		public void writeToParcel(Parcel dest, int flags) {
		ComponentName.writeToParcel(service, dest);
		dest.writeInt(pid);
		dest.writeInt(uid);
		dest.writeString(process);
		dest.writeInt(foreground ? 1 : 0);
		dest.writeLong(activeSince);
		@@ -350,11 +385,13 @@ public class ActivityManager {
		dest.writeInt(crashCount);
		dest.writeLong(lastActivityTime);
		dest.writeLong(restarting);
		dest.writeInt(this.flags);
		}

		public void readFromParcel(Parcel source) {
		service = ComponentName.readFromParcel(source);
		pid = source.readInt();
		uid = source.readInt();
		process = source.readString();
		foreground = source.readInt() != 0;
		activeSince = source.readLong();
		@@ -363,6 +400,7 @@ public class ActivityManager {
		crashCount = source.readInt();
		lastActivityTime = source.readLong();
		restarting = source.readLong();
		flags = source.readInt();
		}

		public static final Creator<RunningServiceInfo> CREATOR = new Creator<RunningServiceInfo>() {

core/java/android/app/ActivityManagerNative.java

+25 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.graphics.Bitmap;
		import android.net.Uri;
		import android.os.Binder;
		import android.os.Bundle;
		import android.os.Debug;
		import android.os.Parcelable;
		import android.os.ParcelFileDescriptor;
		import android.os.RemoteException;
		@@ -1107,6 +1108,16 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		reply.writeNoException();
		return true;
		}

		case GET_PROCESS_MEMORY_INFO_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		int pid = data.readInt();
		Debug.MemoryInfo mi = new Debug.MemoryInfo();
		getProcessMemoryInfo(pid, mi);
		reply.writeNoException();
		mi.writeToParcel(reply, 0);
		return true;
		}
		}

		return super.onTransact(code, data, reply, flags);
		@@ -2425,5 +2436,18 @@ class ActivityManagerProxy implements IActivityManager
		reply.recycle();
		}

		public void getProcessMemoryInfo(int pid, Debug.MemoryInfo outInfo)
		throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeInt(pid);
		mRemote.transact(GET_PROCESS_MEMORY_INFO_TRANSACTION, data, reply, 0);
		reply.readException();
		outInfo.readFromParcel(reply);
		data.recycle();
		reply.recycle();
		}

		private IBinder mRemote;
		}

core/java/android/app/ActivityThread.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1546,6 +1546,10 @@ public final class ActivityThread {
		}
		}

		public void getMemoryInfo(Debug.MemoryInfo outInfo) {
		Debug.getMemoryInfo(outInfo);
		}

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		long nativeMax = Debug.getNativeHeapSize() / 1024;

core/java/android/app/ApplicationThreadNative.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.pm.ServiceInfo;
		import android.content.res.Configuration;
		import android.os.Binder;
		import android.os.Bundle;
		import android.os.Debug;
		import android.os.Parcelable;
		import android.os.RemoteException;
		import android.os.IBinder;
		@@ -370,6 +371,16 @@ public abstract class ApplicationThreadNative extends Binder
		scheduleDestroyBackupAgent(appInfo);
		return true;
		}

		case GET_MEMORY_INFO_TRANSACTION:
		{
		data.enforceInterface(IApplicationThread.descriptor);
		Debug.MemoryInfo mi = new Debug.MemoryInfo();
		getMemoryInfo(mi);
		reply.writeNoException();
		mi.writeToParcel(reply, 0);
		return true;
		}
		}

		return super.onTransact(code, data, reply, flags);
		@@ -756,5 +767,16 @@ class ApplicationThreadProxy implements IApplicationThread {
		IBinder.FLAG_ONEWAY);
		data.recycle();
		}

		public void getMemoryInfo(Debug.MemoryInfo outInfo) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IApplicationThread.descriptor);
		mRemote.transact(GET_MEMORY_INFO_TRANSACTION, data, reply, 0);
		reply.readException();
		outInfo.readFromParcel(reply);
		data.recycle();
		reply.recycle();
		}
		}