Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 410d0375 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "flatbuffers: Add support for BASE_TYPE_LONG" am: 800a0fc4 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2014600

Change-Id: I43f4e3bbe2e10efd61eadbb420e007f699d12958
parents 41093d3f 800a0fc4

system/gd/dumpsys/filter.cc

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ bool UserPrivacyFilter::FilterField(const reflection::Field* field, flatbuffers: 
    case flatbuffers::BASE_TYPE_BOOL:

      return internal::FilterTypeBool(*field, table, privacy_level);

      break;

    case flatbuffers::BASE_TYPE_LONG:

      return internal::FilterTypeLong(*field, table, privacy_level);

      break;

    default:

      LOG_WARN("%s WARN Unsupported base type\n", __func__);

      break;

system/gd/dumpsys/internal/filter_internal.cc

+26 −0
Original line number Diff line number Diff line
@@ -200,6 +200,32 @@ bool internal::FilterTypeFloat(const reflection::Field& field, flatbuffers::Tabl 
  return kFieldHasBeenFiltered;

}



bool internal::FilterTypeLong(const reflection::Field& field, flatbuffers::Table* table, PrivacyLevel privacy_level) {

  ASSERT(table != nullptr);



  const int64_t default_val = flatbuffers::GetFieldDefaultI<int64_t>(field);

  flatbuffers::voffset_t field_offset = field.offset();



  switch (privacy_level) {

    case kPrivate:

      flatbuffers::SetField<int64_t>(table, field, default_val);

      internal::ScrubFromTable(table, field_offset);

      break;

    case kOpaque:

      flatbuffers::SetField<int64_t>(table, field, default_val);

      break;

    case kAnonymized: {

      auto target_field = flatbuffers::GetFieldI<int64_t>(*table, field);

      int64_t new_val = static_cast<int64_t>(std::hash<std::string>{}(std::to_string(target_field)));

      flatbuffers::SetField<int64_t>(table, field, new_val);

    } break;

    default:

    case kAny:

      break;

  }

  return kFieldHasBeenFiltered;

}



bool internal::FilterTypeString(const reflection::Field& field, flatbuffers::Table* table, PrivacyLevel privacy_level) {

  ASSERT(table != nullptr);

  ASSERT(field.type()->base_type() == reflection::BaseType::String);

system/gd/dumpsys/internal/filter_internal.h

+2 −1
Original line number Diff line number Diff line
@@ -115,8 +115,9 @@ const reflection::Object* FindReflectionObject( 
 * @return true if successfully filtered, false otherwise.

 */

bool FilterTypeBool(const reflection::Field& field, flatbuffers::Table* table, PrivacyLevel privacy_level);

bool FilterTypeInteger(const reflection::Field& field, flatbuffers::Table* table, PrivacyLevel privacy_level);

bool FilterTypeFloat(const reflection::Field& field, flatbuffers::Table* table, PrivacyLevel privacy_level);

bool FilterTypeInteger(const reflection::Field& field, flatbuffers::Table* table, PrivacyLevel privacy_level);

bool FilterTypeLong(const reflection::Field& field, flatbuffers::Table* table, PrivacyLevel privacy_level);

bool FilterTypeString(const reflection::Field& field, flatbuffers::Table* table, PrivacyLevel privacy_level);

bool FilterTypeStruct(const reflection::Field& field, flatbuffers::Table* table, PrivacyLevel privacy_level);