Revert "Revert "Remove MbmsDownloadServiceBase special case""
This reverts commit b9ecb4fd257f8f0e7b697c8feca88eea0e100961.
Reason for revert: The api checker has now been fixed (https://android-review.googlesource.com/c/platform/cts/+/913473) so reapply the fix
Change-Id: I76e049938dcbef55a8ac76512ad6530a04805f1f
diff --git a/src/main/java/com/android/tools/metalava/model/ClassItem.kt b/src/main/java/com/android/tools/metalava/model/ClassItem.kt
index 0d072fa..a26b71b 100644
--- a/src/main/java/com/android/tools/metalava/model/ClassItem.kt
+++ b/src/main/java/com/android/tools/metalava/model/ClassItem.kt
@@ -670,18 +670,6 @@
if (!predicate.test(superClass)) {
superClass.filteredInterfaceTypes(predicate, types, true, includeParents, target)
} else if (includeSelf && superClass.isInterface()) {
- // Special case: Arguably, IInterface should be included in the system API by the
- // general rules. However, this was just added to the system API in 28 at the same
- // time as metalava, which did not include some hidden super classes in its analysis.
- // This is now marked as an incompatible API change, so treat this the same way as in
- // API 28 until this is clarified.
- if (superClass.simpleName() == "IInterface" &&
- (target.qualifiedName() == "android.telephony.mbms.vendor.MbmsDownloadServiceBase" ||
- target.qualifiedName() == "android.telephony.mbms.vendor.MbmsStreamingServiceBase")
- ) {
- return types
- }
-
types.add(superClassType)
if (includeParents) {
superClass.filteredInterfaceTypes(predicate, types, true, includeParents, target)
