Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Android Code Review
2009-03-02 10:44:11 -08:00
parent 074da8f9aa 754270601a
commit c8e4d3f918
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/aidl/AST.cpp
View File

@@ -841,23 +841,6 @@ Document::Write(FILE* to)
fprintf(to, "package %s;\n", this->package.c_str());
}
// gather the types for the import statements
set<Type*> types;
N = this->classes.size();
for (i=0; i<N; i++) {
Class* c = this->classes[i];
c->GatherTypes(&types);
}
set<Type*>::iterator it;
for (it=types.begin(); it!=types.end(); it++) {
Type* t = *it;
string pkg = t->Package();
if (pkg.length() != 0 && pkg != this->package) {
fprintf(to, "import %s;\n", t->ImportType().c_str());
}
}
N = this->classes.size();
for (i=0; i<N; i++) {
Class* c = this->classes[i];

6
tools/aidl/generate_java.cpp
View File

@@ -134,7 +134,7 @@ StubClass::make_as_interface(Type *interfaceType)
Method* m = new Method;
m->comment = "/**\n * Cast an IBinder object into an ";
m->comment += interfaceType->Name();
m->comment += interfaceType->QualifiedName();
m->comment += " interface,\n";
m->comment += " * generating a proxy if needed.\n */";
m->modifiers = PUBLIC | STATIC;
@@ -324,7 +324,7 @@ generate_method(const method_type* method, Class* interface,
transactCodeName += method->name.data;
char transactCodeValue[50];
sprintf(transactCodeValue, "(IBinder.FIRST_CALL_TRANSACTION + %d)", index);
sprintf(transactCodeValue, "(android.os.IBinder.FIRST_CALL_TRANSACTION + %d)", index);
Field* transactCode = new Field(STATIC | FINAL,
new Variable(INT_TYPE, transactCodeName));
@@ -518,7 +518,7 @@ generate_method(const method_type* method, Class* interface,
new LiteralExpression("Stub." + transactCodeName),
_data, _reply ? _reply : NULL_VALUE,
new LiteralExpression(
oneway ? "IBinder.FLAG_ONEWAY" : "0"));
oneway ? "android.os.IBinder.FLAG_ONEWAY" : "0"));
tryStatement->statements->Add(call);
// throw back exceptions.