From 41773b73ea02db5b2dc19b6077a5b965feeac374 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Thu, 29 Nov 2018 14:38:30 +0100 Subject: [PATCH] Don't rely on fallthrough in incident_section_gen Silences the following warning during build: frameworks/base/tools/incident_section_gen/main.cpp:265:13: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough] default: ^ frameworks/base/tools/incident_section_gen/main.cpp:265:13: note: insert 'GOOGLE_FALLTHROUGH_INTENDED;' to silence this warning default: ^ GOOGLE_FALLTHROUGH_INTENDED; frameworks/base/tools/incident_section_gen/main.cpp:265:13: note: insert 'break;' to avoid fall-through default: ^ break; Test: make -j50 2>&1 | grep incident_section Change-Id: Ie59510025e59e96f0763726794ff19dae595c672 --- tools/incident_section_gen/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/incident_section_gen/main.cpp b/tools/incident_section_gen/main.cpp index 639f98062b719..0c593fc0adcf0 100644 --- a/tools/incident_section_gen/main.cpp +++ b/tools/incident_section_gen/main.cpp @@ -258,8 +258,9 @@ static bool isDefaultMessageImpl(const Descriptor* descriptor, const Destination return false; case FieldDescriptor::TYPE_STRING: if (getPrivacyFlags(field).patterns_size() != 0) return false; + break; default: - continue; + break; } } parents->erase(descriptor->full_name());