summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-06-17 19:50:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-17 19:50:11 +0000
commit7ef896b5d92c6677bcf323de0871fa743720e4c7 (patch)
tree85079ac64471d0aadbfcfe3f4d174c6d33799c10
parente98bfa7502b6666f2a08e5686c7bdfa15fbe6c3c (diff)
parent538f777b53c1e3ff1d8701e67f5cef3b368a99de (diff)
downloaddoclava-7ef896b5d92c6677bcf323de0871fa743720e4c7.tar.gz
Merge "Remove NotificationCompat.MessagingStyle.Message from allowlist." am: 696f76f1d7 am: 42999b2466 am: 538f777b53
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1326054 Change-Id: Ifd0f049bf993256ca44b529e8025775fff16a4bb
-rw-r--r--src/com/google/doclava/Converter.java3
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: