commit 4d08ea788767db87b3d69cd68bfd34a47ca97270
author Raju Kulkarni <rajukulkarni@google.com> Sat Oct 31 01:52:47 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 31 01:52:47 2020 +0000
tree 71652bf083b85a09eaa5dc094ecc97a155a8a372
parent 3a1e76f9583c627c8aa9aefbec4987f3a0a1d934
parent 1343cd75765a5ca2686355de9ed0a8c416e7308f

Add CharSequence into ignorable imports am: ee71eb3328 am: 1343cd7576

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/aidl/+/12958103

Change-Id: Ia21d001c1b225053db74ab9d11e530a863512613

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