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

Merge "Add workaround for b/124210145" into qt-dev

Browse Source 
am: a8cf106193

Change-Id: I5b942321b38c08262b2721b586bee68036f91a77
This commit is contained in:
Jiyong Park
2019-05-17 23:39:32 -07:00
committed by android-build-merger
parent b7b7a68421 a8cf106193
commit a451bbe520
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);
}
}