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
This commit is contained in:
TreeHugger Robot
2019-05-18 06:16:21 +00:00
committed by Android (Google) Code Review
parent 9faaa2733a 6651eb2142
commit a8cf106193
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) { 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) { 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);
}
} }