diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-17 19:30:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 19:30:14 +0000 |
| commit | 538f777b53c1e3ff1d8701e67f5cef3b368a99de (patch) | |
| tree | 85079ac64471d0aadbfcfe3f4d174c6d33799c10 | |
| parent | 9561b1a71245920ff2ff2502831abb7993767283 (diff) | |
| parent | 42999b246606223288c18b0f0a9d3c0607e0e0aa (diff) | |
| download | doclava-538f777b53c1e3ff1d8701e67f5cef3b368a99de.tar.gz | |
Merge "Remove NotificationCompat.MessagingStyle.Message from allowlist." am: 696f76f1d7 am: 42999b2466
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1326054
Change-Id: I4d3a77bfd1d507a282f9e7dbdeb20f9f0d4a8d16
| -rw-r--r-- | src/com/google/doclava/Converter.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/google/doclava/Converter.java b/src/com/google/doclava/Converter.java index 0e1a4dd..030cdad 100644 --- a/src/com/google/doclava/Converter.java +++ b/src/com/google/doclava/Converter.java @@ -511,8 +511,7 @@ public class Converter { // This should detect the new behavior and be bypassed otherwise. String qualName = containingClass.qualifiedName(); if (!name.contains(".") - && ("androidx.core.app.NotificationCompat.MessagingStyle.Message".equals(qualName) - || "androidx.leanback.widget.GuidedAction.Builder".equals(qualName) + && ("androidx.leanback.widget.GuidedAction.Builder".equals(qualName) || "androidx.leanback.widget.RowHeaderPresenter.ViewHolder".equals(qualName))) { // Constructors of inner classes do not contain the name of the enclosing class // with OpenJDK 8. This simulates the old behavior: |