Merge branch 'gingerbread' into gingerbread-release (4014a327) · Commits · e / os / android_frameworks_base

Android.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -348,7 +348,7 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \
		framework \

		framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
		framework_docs_LOCAL_DROIDDOC_HTML_DIR := $(LOCAL_PATH)/docs/html $(OUT_DOCS)/gen
		# The since flag (-since N.xml API_LEVEL) is used to add API Level information
		# to the reference documentation. Must be in order of oldest to newest.
		framework_docs_LOCAL_DROIDDOC_OPTIONS := \
		@@ -539,8 +539,8 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

		include $(BUILD_DROIDDOC)

		# explicitly specify that online-sdk depends on framework-res.
		$(full_target): framework-res-package-target
		# explicitly specify that online-sdk depends on framework-res and any generated docs
		$(full_target): framework-res-package-target $(ALL_GENERATED_DOCS)

		# ==== docs that have all of the stuff that's @hidden =======================
		include $(CLEAR_VARS)

api/current.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -45115,6 +45115,17 @@
		<parameter name="key" type="java.lang.String">
		</parameter>
		</method>
		<method name="startCommit"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		</interface>
		<interface name="SharedPreferences.OnSharedPreferenceChangeListener"
		abstract="true"

core/java/android/app/ActivityManagerNative.java

+91 −5

Original line number	Diff line number	Diff line
		@@ -1248,8 +1248,9 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM

		case IS_USER_A_MONKEY_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		reply.writeInt(isUserAMonkey() ? 1 : 0);
		boolean areThey = isUserAMonkey();
		reply.writeNoException();
		reply.writeInt(areThey ? 1 : 0);
		return true;
		}

		@@ -1263,8 +1264,9 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		case IS_IMMERSIVE_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		IBinder token = data.readStrongBinder();
		reply.writeInt(isImmersive(token) ? 1 : 0);
		boolean isit = isImmersive(token);
		reply.writeNoException();
		reply.writeInt(isit ? 1 : 0);
		return true;
		}

		@@ -1279,8 +1281,9 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM

		case IS_TOP_ACTIVITY_IMMERSIVE_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		reply.writeInt(isTopActivityImmersive() ? 1 : 0);
		boolean isit = isTopActivityImmersive();
		reply.writeNoException();
		reply.writeInt(isit ? 1 : 0);
		return true;
		}

		@@ -1295,6 +1298,40 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		return true;
		}

		case NEW_URI_PERMISSION_OWNER_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		String name = data.readString();
		IBinder perm = newUriPermissionOwner(name);
		reply.writeNoException();
		reply.writeStrongBinder(perm);
		return true;
		}

		case GRANT_URI_PERMISSION_FROM_OWNER_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		IBinder owner = data.readStrongBinder();
		int fromUid = data.readInt();
		String targetPkg = data.readString();
		Uri uri = Uri.CREATOR.createFromParcel(data);
		int mode = data.readInt();
		grantUriPermissionFromOwner(owner, fromUid, targetPkg, uri, mode);
		reply.writeNoException();
		return true;
		}

		case REVOKE_URI_PERMISSION_FROM_OWNER_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		IBinder owner = data.readStrongBinder();
		Uri uri = null;
		if (data.readInt() != 0) {
		Uri.CREATOR.createFromParcel(data);
		}
		int mode = data.readInt();
		revokeUriPermissionFromOwner(owner, uri, mode);
		reply.writeNoException();
		return true;
		}

		}

		return super.onTransact(code, data, reply, flags);
		@@ -2841,8 +2878,8 @@ class ActivityManagerProxy implements IActivityManager
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeStrongBinder(token);
		mRemote.transact(IS_IMMERSIVE_TRANSACTION, data, reply, 0);
		boolean res = reply.readInt() == 1;
		reply.readException();
		boolean res = reply.readInt() == 1;
		data.recycle();
		reply.recycle();
		return res;
		@@ -2854,8 +2891,8 @@ class ActivityManagerProxy implements IActivityManager
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		mRemote.transact(IS_TOP_ACTIVITY_IMMERSIVE_TRANSACTION, data, reply, 0);
		boolean res = reply.readInt() == 1;
		reply.readException();
		boolean res = reply.readInt() == 1;
		data.recycle();
		reply.recycle();
		return res;
		@@ -2876,5 +2913,54 @@ class ActivityManagerProxy implements IActivityManager
		reply.recycle();
		}

		public IBinder newUriPermissionOwner(String name)
		throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeString(name);
		mRemote.transact(NEW_URI_PERMISSION_OWNER_TRANSACTION, data, reply, 0);
		reply.readException();
		IBinder res = reply.readStrongBinder();
		data.recycle();
		reply.recycle();
		return res;
		}

		public void grantUriPermissionFromOwner(IBinder owner, int fromUid, String targetPkg,
		Uri uri, int mode) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeStrongBinder(owner);
		data.writeInt(fromUid);
		data.writeString(targetPkg);
		uri.writeToParcel(data, 0);
		data.writeInt(mode);
		mRemote.transact(GRANT_URI_PERMISSION_TRANSACTION, data, reply, 0);
		reply.readException();
		data.recycle();
		reply.recycle();
		}

		public void revokeUriPermissionFromOwner(IBinder owner, Uri uri,
		int mode) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeStrongBinder(owner);
		if (uri != null) {
		data.writeInt(1);
		uri.writeToParcel(data, 0);
		} else {
		data.writeInt(0);
		}
		data.writeInt(mode);
		mRemote.transact(REVOKE_URI_PERMISSION_TRANSACTION, data, reply, 0);
		reply.readException();
		data.recycle();
		reply.recycle();
		}

		private IBinder mRemote;
		}

core/java/android/app/ContextImpl.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -2840,6 +2840,11 @@ class ContextImpl extends Context {
		}
		}

		public void startCommit() {
		// TODO: implement
		commit();
		}

		public boolean commit() {
		boolean returnValue;

core/java/android/app/IActivityManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -318,6 +318,12 @@ public interface IActivityManager extends IInterface {
		public void crashApplication(int uid, int initialPid, String packageName,
		String message) throws RemoteException;

		public IBinder newUriPermissionOwner(String name) throws RemoteException;
		public void grantUriPermissionFromOwner(IBinder owner, int fromUid, String targetPkg,
		Uri uri, int mode) throws RemoteException;
		public void revokeUriPermissionFromOwner(IBinder owner, Uri uri,
		int mode) throws RemoteException;

		/*
		* Private non-Binder interfaces
		*/
		@@ -524,4 +530,7 @@ public interface IActivityManager extends IInterface {
		int SET_IMMERSIVE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+111;
		int IS_TOP_ACTIVITY_IMMERSIVE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+112;
		int CRASH_APPLICATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+113;
		int NEW_URI_PERMISSION_OWNER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+114;
		int GRANT_URI_PERMISSION_FROM_OWNER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+115;
		int REVOKE_URI_PERMISSION_FROM_OWNER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+116;
		}