From 855003deb7f492f8adb0a728d1268b3f9cb2c05a Mon Sep 17 00:00:00 2001
From: Joshua Bloch <jjb@google.com>
Date: Thu, 27 Aug 2009 14:43:03 -0700
Subject: Making Droiddoc not explode when inherited interfaces disappear.

---
 tools/apicheck/src/com/android/apicheck/ClassInfo.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tools/apicheck')

diff --git a/tools/apicheck/src/com/android/apicheck/ClassInfo.java b/tools/apicheck/src/com/android/apicheck/ClassInfo.java
index 5405ad2..d4416f4 100644
--- a/tools/apicheck/src/com/android/apicheck/ClassInfo.java
+++ b/tools/apicheck/src/com/android/apicheck/ClassInfo.java
@@ -121,7 +121,11 @@ public class ClassInfo {
             consistent = false;
         }
         for (String iface : mInterfaces) {
-            if (!cl.mInterfaces.contains(iface)) {
+            boolean found = false;
+            for (ClassInfo c = cl; c != null && !found; c = c.mSuperClass) {
+                found = c.mInterfaces.contains(iface);
+            }
+            if (!found) {
                 Errors.error(Errors.REMOVED_INTERFACE, cl.position(),
                         "Class " + qualifiedName() + " no longer implements " + iface);
             }
-- 
cgit v1.1