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

Commit 8bdf4ec6 authored by Eden Su's avatar Eden Su Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android’s inclusive language guidance"... 

Merge "Update language to comply with Android’s inclusive language guidance" into main am: 04b22dd2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2836225



Change-Id: I8a23a1a0dc110e3e620553b065e6649c421791e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d38f63e2 04b22dd2

cmds/dumpstate/dumpstate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1519,7 +1519,7 @@ static void DumpExternalFragmentationInfo() { 
}



static void DumpstateLimitedOnly() {

    // Trimmed-down version of dumpstate to only include a whitelisted

    // Trimmed-down version of dumpstate to only include a allowlisted

    // set of logs (system log, event log, and system server / system app

    // crashes, and networking logs). See b/136273873 and b/138459828

    // for context.

libs/binder/include/binder/IInterface.h

+6 −6
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ public: 
                  "The preferred way to add interfaces is to define "   \

                  "an .aidl file to auto-generate the interface. If "   \

                  "an interface must be manually written, add its "     \

                  "name to the whitelist.");                            \

    DO_NOT_DIRECTLY_USE_ME_IMPLEMENT_META_INTERFACE(INTERFACE, NAME)    \

                  "name to the allowlist.");                            \

    DO_NOT_DIRECTLY_USE_ME_IMPLEMENT_META_INTERFACE(INTERFACE, NAME)



#else
@@ -305,10 +305,10 @@ constexpr bool equals(const char* a, const char* b) { 
  return equals(a + 1, b + 1);

}



constexpr bool inList(const char* a, const char* const* whitelist) {

  if (*whitelist == nullptr) return false;

  if (equals(a, *whitelist)) return true;

  return inList(a, whitelist + 1);

constexpr bool inList(const char* a, const char* const* allowlist) {

  if (*allowlist == nullptr) return false;

  if (equals(a, *allowlist)) return true;

  return inList(a, allowlist + 1);

}



constexpr bool allowedManualInterface(const char* name) {