commit 81bcd7628b70f2cd69b9634cfd7dabc4a66bbf30
author android-build-team Robot <android-build-team-robot@google.com> Sat Oct 31 00:25:45 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Oct 31 00:25:45 2020 +0000
tree 71652bf083b85a09eaa5dc094ecc97a155a8a372
parent 3a1e76f9583c627c8aa9aefbec4987f3a0a1d934
parent 7c27de3df1de00a845b3bee6887059c0b37cb54f

Merge cherrypicks of [12960599, 12959910, 12960718, 12960387] into rvc-qpr1-release

Change-Id: Idbfe226611b09c93853a37718bd680d4da3a5b34

aidl_typenames.cpp

diff --git a/aidl_typenames.cpp b/aidl_typenames.cpp
index ad89c1c..51c26d7 100644
--- a/aidl_typenames.cpp
+++ b/aidl_typenames.cpp
@@ -82,9 +82,9 @@
 }
 
 bool AidlTypenames::IsIgnorableImport(const string& import) const {
-  static set<string> ignore_import = {"android.os.IInterface",   "android.os.IBinder",
-                                      "android.os.Parcelable",   "android.os.Parcel",
-                                      "android.content.Context", "java.lang.String"};
+  static set<string> ignore_import = {
+      "android.os.IInterface",   "android.os.IBinder", "android.os.Parcelable", "android.os.Parcel",
+      "android.content.Context", "java.lang.String",   "java.lang.CharSequence"};
   // these known built-in types don't need to be imported
   const bool in_ignore_import = ignore_import.find(import) != ignore_import.end();
   // an already defined type doesn't need to be imported again unless it is from