commit 3d383085223c7ef9c38698160af10e6ac4a890c8
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Tue Jan 12 22:48:11 2021 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Tue Jan 12 22:48:11 2021 +0000
tree 71652bf083b85a09eaa5dc094ecc97a155a8a372
parent 652e5e876009c4fa7ad61dc26d3e4cd84e9827d4
parent 58b0d7bfdec7e1bb1538463e45764f3e72e55319

Snap for 7077657 from 58b0d7bfdec7e1bb1538463e45764f3e72e55319 to r-keystone-qcom-release

Change-Id: I64607b7d724e97382197dfcd69dcb0dbe9d7583a

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