Merge commit 'goog/eclair' into eclair-release (e89fec34) · Commits · e / os / android_frameworks_base

api/current.xml

+68 −77

Original line number	Diff line number	Diff line
		@@ -16877,6 +16877,21 @@
		visibility="public"
		>
		</method>
		<method name="overridePendingTransition"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="enterAnim" type="int">
		</parameter>
		<parameter name="exitAnim" type="int">
		</parameter>
		</method>
		<method name="registerForContextMenu"
		return="void"
		abstract="false"
		@@ -25927,19 +25942,6 @@
		<parameter name="name" type="java.lang.String">
		</parameter>
		</method>
		<method name="setScanMode"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="mode" type="int">
		</parameter>
		</method>
		<method name="startDiscovery"
		return="boolean"
		abstract="false"
		@@ -25984,6 +25986,17 @@
		visibility="public"
		>
		</field>
		<field name="ACTION_REQUEST_DISCOVERABLE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.bluetooth.adapter.action.REQUEST_DISCOVERABLE""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_SCAN_MODE_CHANGED"
		type="java.lang.String"
		transient="false"
		@@ -26017,6 +26030,17 @@
		visibility="public"
		>
		</field>
		<field name="EXTRA_DISCOVERABLE_DURATION"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.bluetooth.adapter.extra.DISCOVERABLE_DURATION""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_LOCAL_NAME"
		type="java.lang.String"
		transient="false"
		@@ -27063,28 +27087,6 @@
		>
		<implements name="android.os.Parcelable">
		</implements>
		<method name="cancelBondProcess"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="createBond"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="createRfcommSocket"
		return="android.bluetooth.BluetoothSocket"
		abstract="false"
		@@ -27155,17 +27157,6 @@
		visibility="public"
		>
		</method>
		<method name="removeBond"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="writeToParcel"
		return="void"
		abstract="false"
		@@ -113131,6 +113122,37 @@
		>
		</field>
		</interface>
		<class name="ContactsContract.CommonDataKinds.Birthday"
		extends="java.lang.Object"
		abstract="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<field name="BIRTHDAY"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""data1""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="CONTENT_ITEM_TYPE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""vnd.android.cursor.item/birthday""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="ContactsContract.CommonDataKinds.Email"
		extends="java.lang.Object"
		abstract="false"
		@@ -113617,37 +113639,6 @@
		>
		</field>
		</class>
		<class name="ContactsContract.CommonDataKinds.Miscellaneous"
		extends="java.lang.Object"
		abstract="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<field name="BIRTHDAY"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""data1""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="CONTENT_ITEM_TYPE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""vnd.android.cursor.item/misc""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="ContactsContract.CommonDataKinds.Nickname"
		extends="java.lang.Object"
		abstract="false"

core/java/android/app/Activity.java

+24 −6

Original line number	Diff line number	Diff line
		@@ -2556,14 +2556,15 @@ public class Activity extends ContextThemeWrapper
		*
		* <p>You can use this function as a simple way to launch the search UI, in response to a
		* menu item, search button, or other widgets within your activity. Unless overidden,
		* calling this function is the same as calling:
		* <p>The default implementation simply calls
		* {@link #startSearch startSearch(null, false, null, false)}, launching a local search.
		* calling this function is the same as calling
		* {@link #startSearch startSearch(null, false, null, false)}, which launches
		* search for the current activity as specified in its manifest, see {@link SearchManager}.
		*
		* <p>You can override this function to force global search, e.g. in response to a dedicated
		* search key, or to block search entirely (by simply returning false).
		*
		* @return Returns true if search launched, false if activity blocks it
		* @return Returns {@code true} if search launched, and {@code false} if activity blocks it.
		* The default implementation always returns {@code true}.
		*
		* @see android.app.SearchManager
		*/
		@@ -3014,6 +3015,23 @@ public class Activity extends ContextThemeWrapper
		flagsMask, flagsValues, child);
		}

		/**
		* Call immediately after one of the flavors of {@link #startActivity(Intent)}
		* or {@link #finish} to specify an explicit transition animation to
		* perform next.
		* @param enterAnim A resource ID of the animation resource to use for
		* the incoming activity.
		* @param exitAnim A resource ID of the animation resource to use for
		* the outgoing activity.
		*/
		public void overridePendingTransition(int enterAnim, int exitAnim) {
		try {
		ActivityManagerNative.getDefault().overridePendingTransition(
		mToken, getPackageName(), enterAnim, exitAnim);
		} catch (RemoteException e) {
		}
		}

		/**
		* Call this to set the result that your activity will return to its
		* caller.

core/java/android/app/ActivityManagerNative.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -1153,6 +1153,16 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		reply.writeNoException();
		return true;
		}

		case OVERRIDE_PENDING_TRANSITION_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		IBinder token = data.readStrongBinder();
		String packageName = data.readString();
		int enterAnim = data.readInt();
		int exitAnim = data.readInt();
		overridePendingTransition(token, packageName, enterAnim, exitAnim);
		return true;
		}
		}

		return super.onTransact(code, data, reply, flags);
		@@ -2530,5 +2540,20 @@ class ActivityManagerProxy implements IActivityManager
		reply.recycle();
		}

		public void overridePendingTransition(IBinder token, String packageName,
		int enterAnim, int exitAnim) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeStrongBinder(token);
		data.writeString(packageName);
		data.writeInt(enterAnim);
		data.writeInt(exitAnim);
		mRemote.transact(OVERRIDE_PENDING_TRANSITION_TRANSACTION, data, reply, 0);
		reply.readException();
		data.recycle();
		reply.recycle();
		}

		private IBinder mRemote;
		}

core/java/android/app/ActivityThread.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -292,9 +292,9 @@ public final class ActivityThread {
		}

		public PackageInfo(ActivityThread activityThread, String name,
		Context systemContext) {
		Context systemContext, ApplicationInfo info) {
		mActivityThread = activityThread;
		mApplicationInfo = new ApplicationInfo();
		mApplicationInfo = info != null ? info : new ApplicationInfo();
		mApplicationInfo.packageName = name;
		mPackageName = name;
		mAppDir = null;
		@@ -2202,7 +2202,7 @@ public final class ActivityThread {
		if (mSystemContext == null) {
		ApplicationContext context =
		ApplicationContext.createSystemContext(this);
		PackageInfo info = new PackageInfo(this, "android", context);
		PackageInfo info = new PackageInfo(this, "android", context, null);
		context.init(info, null, this);
		context.getResources().updateConfiguration(
		getConfiguration(), getDisplayMetricsLocked(false));
		@@ -2214,6 +2214,13 @@ public final class ActivityThread {
		return mSystemContext;
		}

		public void installSystemApplicationInfo(ApplicationInfo info) {
		synchronized (this) {
		ApplicationContext context = getSystemContext();
		context.init(new PackageInfo(this, "android", context, info), null, this);
		}
		}

		void scheduleGcIdler() {
		if (!mGcIdlerScheduled) {
		mGcIdlerScheduled = true;

core/java/android/app/IActivityManager.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -285,6 +285,9 @@ public interface IActivityManager extends IInterface {
		public Debug.MemoryInfo[] getProcessMemoryInfo(int[] pids)
		throws RemoteException;

		public void overridePendingTransition(IBinder token, String packageName,
		int enterAnim, int exitAnim) throws RemoteException;

		/*
		* Private non-Binder interfaces
		*/
		@@ -444,4 +447,5 @@ public interface IActivityManager extends IInterface {
		int GET_PROCESS_MEMORY_INFO_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+97;
		int KILL_APPLICATION_PROCESS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+98;
		int START_ACTIVITY_INTENT_SENDER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+99;
		int OVERRIDE_PENDING_TRANSITION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+100;
		}