Merge "Revert "Revert "The com.android.athome api classes are moving android.support.place.""" (18ce4566) · Commits · e / os / android_frameworks_base

tools/aidl/Type.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -123,7 +123,7 @@ register_base_types()
	RPC_DATA_TYPE = new RpcDataType();		RPC_DATA_TYPE = new RpcDataType();
	NAMES.Add(RPC_DATA_TYPE);		NAMES.Add(RPC_DATA_TYPE);

	RPC_ERROR_TYPE = new UserDataType("com.android.athome.rpc", "RpcError",		RPC_ERROR_TYPE = new UserDataType("android.support.place.rpc", "RpcError",
	true, __FILE__, __LINE__);		true, __FILE__, __LINE__);
	NAMES.Add(RPC_ERROR_TYPE);		NAMES.Add(RPC_ERROR_TYPE);

	@@ -1234,7 +1234,7 @@ GenericListType::CreateFromRpcData(StatementBlock* addTo, Expression* k, Variabl
	// ================================================================		// ================================================================

	RpcDataType::RpcDataType()		RpcDataType::RpcDataType()
	:UserDataType("com.android.athome.rpc", "RpcData", true, true, true)		:UserDataType("android.support.place.rpc", "RpcData", true, true, true)
	{		{
	}		}

tools/aidl/generate_java_rpc.cpp

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -7,26 +7,26 @@

	Type* SERVICE_CONTEXT_TYPE = new Type("android.content",		Type* SERVICE_CONTEXT_TYPE = new Type("android.content",
	"Context", Type::BUILT_IN, false, false, false);		"Context", Type::BUILT_IN, false, false, false);
	Type* PRESENTER_BASE_TYPE = new Type("com.android.athome.connector",		Type* PRESENTER_BASE_TYPE = new Type("android.support.place.connector",
	"EventListener", Type::BUILT_IN, false, false, false);		"EventListener", Type::BUILT_IN, false, false, false);
	Type* PRESENTER_LISTENER_BASE_TYPE = new Type("com.android.athome.connector",		Type* PRESENTER_LISTENER_BASE_TYPE = new Type("android.support.place.connector",
	"EventListener.Listener", Type::BUILT_IN, false, false, false);		"EventListener.Listener", Type::BUILT_IN, false, false, false);
	Type* RPC_BROKER_TYPE = new Type("com.android.athome.connector", "Broker",		Type* RPC_BROKER_TYPE = new Type("android.support.place.connector", "Broker",
	Type::BUILT_IN, false, false, false);		Type::BUILT_IN, false, false, false);
	Type* RPC_CONTAINER_TYPE = new Type("com.android.athome.connector", "ConnectorContainer",		Type* RPC_CONTAINER_TYPE = new Type("com.android.athome.connector", "ConnectorContainer",
	Type::BUILT_IN, false, false, false);		Type::BUILT_IN, false, false, false);
	Type* PLACE_INFO_TYPE = new Type("android.support.place.connector", "PlaceInfo",		Type* PLACE_INFO_TYPE = new Type("android.support.place.connector", "PlaceInfo",
	Type::BUILT_IN, false, false, false);		Type::BUILT_IN, false, false, false);
	// TODO: Just use Endpoint, so this works for all endpoints.		// TODO: Just use Endpoint, so this works for all endpoints.
	Type* RPC_CONNECTOR_TYPE = new Type("com.android.athome.connector", "Connector",		Type* RPC_CONNECTOR_TYPE = new Type("android.support.place.connector", "Connector",
	Type::BUILT_IN, false, false, false);		Type::BUILT_IN, false, false, false);
	Type* RPC_ENDPOINT_INFO_TYPE = new UserDataType("com.android.athome.rpc",		Type* RPC_ENDPOINT_INFO_TYPE = new UserDataType("android.support.place.rpc",
	"EndpointInfo", true, __FILE__, __LINE__);		"EndpointInfo", true, __FILE__, __LINE__);
	Type* RPC_RESULT_HANDLER_TYPE = new UserDataType("com.android.athome.rpc", "RpcResultHandler",		Type* RPC_RESULT_HANDLER_TYPE = new UserDataType("android.support.place.rpc", "RpcResultHandler",
	true, __FILE__, __LINE__);		true, __FILE__, __LINE__);
	Type* RPC_ERROR_LISTENER_TYPE = new Type("com.android.athome.rpc", "RpcErrorHandler",		Type* RPC_ERROR_LISTENER_TYPE = new Type("android.support.place.rpc", "RpcErrorHandler",
	Type::BUILT_IN, false, false, false);		Type::BUILT_IN, false, false, false);
	Type* RPC_CONTEXT_TYPE = new UserDataType("com.android.athome.rpc", "RpcContext", true,		Type* RPC_CONTEXT_TYPE = new UserDataType("android.support.place.rpc", "RpcContext", true,
	__FILE__, __LINE__);		__FILE__, __LINE__);

	static void generate_create_from_data(Type* t, StatementBlock* addTo, const string& key,		static void generate_create_from_data(Type* t, StatementBlock* addTo, const string& key,