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

Add workaround for b/124210145

Browse Source 
Problem description:
Metalava emits signature of a method under a class, even when the method
is not defined in the class when the method is inherited from a hidden
ancestor and the method is part of the public interface that the class
is expected to implement.

To be specific, inside the api signature, MmbmsDownloadServiceBase has
asBinder() and onTransact(). The methods are not defined in the class
but inherited from the auto-generated hidden class
IMbmsDownloadService.Stub. However, since the methods are also declared
in the public ancestors of the class, e.g., Binder and IInterface,
the methods are force-included in the class. Omitting the methods will
cause problem when building the stub version of the class.

This inclusion of the inherited method is breaking
SystemApiAnnotationTest. That's because the test ensures that a symbol
listed in the API signature file for the System API is actually
annotated with @SystemApi.

Solution:
To workaround the issue, actually implement the auto-generated methods
inside the class and annotate them.

Bug: 124210145
Test: atest CtsSystemApiAnnotationTestCases
Change-Id: I6760f6e4068239361c495ae7c0de3e25f91d38e1
This commit is contained in:
Jiyong Park
2019-05-11 00:00:35 +09:00
parent 60d2586b2c
commit 6651eb2142
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telephony/java/android/telephony/mbms/vendor/MbmsDownloadServiceBase.java vendored
View File

@@ -549,4 +549,22 @@ public class MbmsDownloadServiceBase extends IMbmsDownloadService.Stub {
*/
public void onAppCallbackDied(int uid, int subscriptionId) {
}
// Following two methods exist to workaround b/124210145
/** @hide */
@SystemApi
@TestApi
@Override
public android.os.IBinder asBinder() {
return super.asBinder();
}
/** @hide */
@SystemApi
@TestApi
@Override
public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply,
int flags) throws RemoteException {
return super.onTransact(code, data, reply, flags);
}
}

19
telephony/java/android/telephony/mbms/vendor/MbmsStreamingServiceBase.java vendored
View File

@@ -294,4 +294,23 @@ public class MbmsStreamingServiceBase extends IMbmsStreamingService.Stub {
*/
public void onAppCallbackDied(int uid, int subscriptionId) {
}
// Following two methods exist to workaround b/124210145
/** @hide */
@SystemApi
@TestApi
@Override
public android.os.IBinder asBinder() {
return super.asBinder();
}
/** @hide */
@SystemApi
@TestApi
@Override
public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply,
int flags) throws RemoteException {
return super.onTransact(code, data, reply, flags);
}
}