commit 2c5145d8859db1097c6c6081185ce40a013b8c0c
author Linux Build Service Account <lnxbuild@localhost> Thu Feb 04 04:18:26 2021 -0800
committer Linux Build Service Account <lnxbuild@localhost> Thu Feb 04 04:18:26 2021 -0800
tree 71652bf083b85a09eaa5dc094ecc97a155a8a372
parent 7473e25a4a29a3717fdf00fbb40772a84a12a3f7
parent 3d383085223c7ef9c38698160af10e6ac4a890c8

Merge 3d383085223c7ef9c38698160af10e6ac4a890c8 on remote branch

Change-Id: Ie3ab2a9b5d222b7f2f30a05c25c9682697dbea44

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