Snap for 4713750 from 6a7e107ad0c958687c4e80ef332f9ed999f50eb5 to pi-release

Change-Id: Ia908b79fc4728b751b6a3deb2f031eb8bbd43dec

2 files changed, 7 insertions, 2 deletions

diff --git a/src/com/google/doclava/MemberInfo.java b/src/com/google/doclava/MemberInfo.java
index 8e7863e..797b1b9 100644
--- a/src/com/google/doclava/MemberInfo.java
+++ b/src/com/google/doclava/MemberInfo.java
@@ -136,6 +136,10 @@ public abstract class MemberInfo extends DocInfo implements Comparable, Scoped {
     return mContainingClass;
   }
 
+  public boolean isCloned() {
+    return mContainingClass != mRealContainingClass;
+  }
+
   /**
    * Returns {@code true} if the member's scope is above the minimum requested scope passed to
    * Doclava.  Provided that the {@code -showAnnotationOverridesVisibility} argument was passed to
diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java
index c4453af..3d260ea 100644
--- a/src/com/google/doclava/Stubs.java
+++ b/src/com/google/doclava/Stubs.java
@@ -253,7 +253,8 @@ public class Stubs {
     ApiPredicate apiReference = new ApiPredicate().setIgnoreShown(true);
     Predicate<MemberInfo> apiEmit = apiFilter.and(new ElidingPredicate(apiReference));
 
-    Predicate<MemberInfo> privateEmit = apiFilter.negate();
+    Predicate<MemberInfo> memberIsNotCloned = (x -> !x.isCloned());
+    Predicate<MemberInfo> privateEmit = memberIsNotCloned.and(apiFilter.negate());
     Predicate<MemberInfo> privateReference = (x -> true);
 
     FilterPredicate removedFilter =
@@ -1563,7 +1564,7 @@ public class Stubs {
         .sorted(MethodInfo.comparator).collect(Collectors.toList());
     List<FieldInfo> enums = cl.getExhaustiveEnumConstants().stream().filter(filterEmit)
         .sorted(FieldInfo.comparator).collect(Collectors.toList());
-    List<FieldInfo> fields = cl.filteredFields(filterEmit).stream()
+    List<FieldInfo> fields = cl.getExhaustiveFields().stream().filter(filterEmit)
         .sorted(FieldInfo.comparator).collect(Collectors.toList());
 
     for (MethodInfo mi : constructors) {