Merge "Add workaround for b/124210145" (c11ffe7d) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/mbms/vendor/MbmsDownloadServiceBase.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}