Generated files from "amd64-generic-codesearch" build 8780307474345098305, revision 210855c9ec7900ea76688945349569f49831e892
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/chromeos/includes/tensorflow/core/platform/types.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/chromeos/includes/tensorflow/core/platform/types.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/chromeos/includes/tensorflow/core/platform/types.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/chromeos/includes/tensorflow/core/platform/types.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/chromeos/tests/common/random_test.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/chromeos/tests/common/random_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/chromeos/tests/common/random_test.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/chromeos/tests/common/random_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/common/random/random.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/common/random/random.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/common/random/random.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/common/random/random.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/common/random/random.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/common/random/random.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/common/random/random.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/common/random/random.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/runtime/include/NeuralNetworksTypes.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/runtime/include/NeuralNetworksTypes.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/runtime/include/NeuralNetworksTypes.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/aosp/frameworks/ml/runtime/include/NeuralNetworksTypes.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/example/component/component.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/example/component/component.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/example/component/component.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/example/component/component.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/example/include/component/component.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/example/include/component/component.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/example/include/component/component.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/example/include/component/component.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/testrunner.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/testrunner.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/testrunner.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/testrunner.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/testrunner.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/testrunner.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r473/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/testrunner.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/aosp-frameworks-ml-nn-0.0.1-r474/work/aosp-frameworks-ml-nn-0.0.1/platform2/common-mk/testrunner.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl_test.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl_test.cc
index cba8c1d..dfb514e 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl_test.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/events/crash_events_impl_test.cc
@@ -200,6 +200,18 @@
EXPECT_EQ(result[1]->upload_info->creation_time, kCreationTime);
}
+TEST(UploadsLogParserTest, MultipleDelimitersLogLineBreaksCorrectly) {
+ constexpr char kWhitespaces[] = {' ', '\n', '\t', '\r', '\f'};
+ std::ostringstream stream;
+ for (const auto delimiter : kWhitespaces) {
+ stream << kValidLogLine << delimiter;
+ }
+ const auto result = ParseUploadsLog(stream.str(), /*is_uploaded=*/true,
+ /*creation_time=*/base::Time(),
+ /*init_offset=*/kInitOffset);
+ EXPECT_EQ(result.size(), std::size(kWhitespaces));
+}
+
// Tests invalid or blank lines.
class UploadsLogParserInvalidTest
: public ::testing::TestWithParam<
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/assert.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/assert.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/assert.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/assert.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/ctype.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/ctype.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/ctype.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/ctype.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/endian.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/endian.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/endian.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/endian.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/inttypes.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/inttypes.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/inttypes.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/inttypes.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/limits.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/limits.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/limits.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/limits.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/math.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/math.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/math.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/math.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stdbool.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stdbool.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stdbool.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stdbool.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stddef.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stddef.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stddef.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stddef.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stdint.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stdint.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stdint.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stdint.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stdio.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stdio.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stdio.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stdio.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stdlib.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stdlib.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/stdlib.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/stdlib.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/string.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/string.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/string.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/string.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/strings.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/strings.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/strings.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/strings.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/sys/time.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/sys/time.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/sys/time.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/sys/time.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/sys/types.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/sys/types.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/sys/types.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/sys/types.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/time.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/time.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/builtin/time.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/builtin/time.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/chip/host/reboot.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/chip/host/reboot.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/chip/host/reboot.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/chip/host/reboot.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/chip/ish/system_state.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/chip/ish/system_state.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/chip/ish/system_state.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/chip/ish/system_state.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/chip/mt_scp/rv32i_common/cache.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/chip/mt_scp/rv32i_common/cache.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/chip/mt_scp/rv32i_common/cache.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/chip/mt_scp/rv32i_common/cache.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/common/spi/flash_reg/private/common.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/common/spi/flash_reg/private/common.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/common/spi/flash_reg/private/common.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/common/spi/flash_reg/private/common.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/common/spi/flash_reg/private/util.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/common/spi/flash_reg/private/util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/common/spi/flash_reg/private/util.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/common/spi/flash_reg/private/util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/cortex-m/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/cortex-m/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/cortex-m/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/cortex-m/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/cortex-m/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/cortex-m/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/cortex-m/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/cortex-m/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/cortex-m0/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/cortex-m0/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/cortex-m0/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/cortex-m0/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/cortex-m0/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/cortex-m0/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/cortex-m0/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/cortex-m0/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/host/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/host/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/host/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/host/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/host/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/host/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/host/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/host/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/minute-ia/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/minute-ia/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/minute-ia/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/minute-ia/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/minute-ia/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/minute-ia/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/minute-ia/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/minute-ia/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/nds32/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/nds32/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/nds32/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/nds32/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/nds32/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/nds32/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/nds32/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/nds32/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/riscv-rv32i/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/riscv-rv32i/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/riscv-rv32i/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/riscv-rv32i/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/riscv-rv32i/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/riscv-rv32i/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/core/riscv-rv32i/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/core/riscv-rv32i/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/driver/sync.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/driver/sync.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/driver/sync.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/driver/sync.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/fuzz/span.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/fuzz/span.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/fuzz/span.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/fuzz/span.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/audio_codec.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/audio_codec.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/audio_codec.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/audio_codec.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/benchmark.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/benchmark.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/benchmark.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/benchmark.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/byteorder.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/byteorder.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/byteorder.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/byteorder.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/clock.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/clock.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/clock.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/clock.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/common.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/common.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/common.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/common.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/compiler.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/compiler.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/compiler.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/compiler.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/config.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/config.h
similarity index 99%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/config.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/config.h
index 392b568..fb492a6 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/config.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/config.h
@@ -355,15 +355,6 @@
#undef CONFIG_ALS_TCS3400
/*
- * Define to use atime tables in anti-saturation algos in the tcs3400 driver.
- * Defining this for a board makes the anti-saturation algorithm much more
- * efficient, but requires the board to have it's lens cover scale and k_channel
- * scales to be determined. Define this for a board once it's added its
- * cover_scale and k_channel scale factors.
- */
-#undef CONFIG_TCS_USE_LUX_TABLE
-
-/*
* Define the event to raise when a sensor interrupt triggers.
* Must be within TASK_EVENT_MOTION_INTERRUPT_MASK.
*/
@@ -3204,6 +3195,10 @@
#define CONFIG_LED_PWM_SOC_SUSPEND_COLOR EC_LED_COLOR_GREEN
#define CONFIG_LED_PWM_LOW_BATT_COLOR EC_LED_COLOR_AMBER
+/* By default, 500 ms period, 50% duty cycle. */
+#define LED_CHARGER_ERROR_ON_TIME 1
+#define LED_CHARGER_ERROR_PERIOD 2
+
/*
* By default the PWM LED behaviour is reflected on both LEDs and includes the
* chipset state, battery state, as well as the charging state. Enable
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/crc.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/crc.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/crc.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/crc.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/device_event.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/device_event.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/device_event.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/device_event.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/ec_commands.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/ec_commands.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/ec_commands.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/ec_commands.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/i2c.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/i2c.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/i2c.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/i2c.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/mkbp_event.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/mkbp_event.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/mkbp_event.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/mkbp_event.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/mock/timer_mock.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/mock/timer_mock.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/mock/timer_mock.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/mock/timer_mock.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/panic_defs.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/panic_defs.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/panic_defs.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/panic_defs.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/queue.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/queue.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/queue.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/queue.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/rgb_keyboard.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/rgb_keyboard.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/rgb_keyboard.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/rgb_keyboard.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/rsa.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/rsa.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/rsa.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/rsa.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/rtc.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/rtc.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/rtc.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/rtc.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/sha1.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/sha1.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/sha1.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/sha1.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/stack_trace.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/stack_trace.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/stack_trace.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/stack_trace.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/system.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/system.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/system.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/system.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/task.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/task.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/task.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/task.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/test_util.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/test_util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/test_util.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/test_util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/timer.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/timer.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/timer.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/timer.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/util.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/util.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/watchdog.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/watchdog.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/include/watchdog.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/include/watchdog.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/aes.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/aes.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/aes.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/aes.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/benchmark.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/benchmark.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/benchmark.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/benchmark.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/genvif/src/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/genvif/src/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/genvif/src/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/genvif/src/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/genvif/src/timer.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/genvif/src/timer.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/genvif/src/timer.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/genvif/src/timer.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/timer.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/timer.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/test/timer.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/test/timer.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/third_party/zephyr/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/third_party/zephyr/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/third_party/zephyr/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/third_party/zephyr/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/util/cros_ec_dev.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/util/cros_ec_dev.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/util/cros_ec_dev.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/util/cros_ec_dev.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/util/uut/main.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/util/uut/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/util/uut/main.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/util/uut/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/include/dt-bindings/motionsense/utils.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/include/dt-bindings/motionsense/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/include/dt-bindings/motionsense/utils.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/include/dt-bindings/motionsense/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/include/emul/utils.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/include/emul/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/include/emul/utils.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/include/emul/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/atomic.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/atomic.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/atomic.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/atomic.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/builtin/assert.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/builtin/assert.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/builtin/assert.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/builtin/assert.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/cpu.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/cpu.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/cpu.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/cpu.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/i2c/i2c.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/i2c/i2c.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/i2c/i2c.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/i2c/i2c.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/usbc/utils.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/usbc/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/shim/include/usbc/utils.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/shim/include/usbc/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/stubs.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/stubs.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/stubs.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/stubs.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/utils.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/utils.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/test/drivers/common/include/test/drivers/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/test/uart_printf/include/common.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/test/uart_printf/include/common.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/test/uart_printf/include/common.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/test/uart_printf/include/common.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/test/uart_printf/src/main.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/test/uart_printf/src/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15066/work/ec-utils-0.0.2/zephyr/test/uart_printf/src/main.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/ec-utils-0.0.2-r15068/work/ec-utils-0.0.2/zephyr/test/uart_printf/src/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/iioservice-9999/work/iioservice-9999/platform2/metrics/structured/recorder_impl.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/iioservice-9999/work/iioservice-9999/platform2/metrics/structured/recorder_impl.cc
index 60ba5ae..e6b3800 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/iioservice-9999/work/iioservice-9999/platform2/metrics/structured/recorder_impl.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/iioservice-9999/work/iioservice-9999/platform2/metrics/structured/recorder_impl.cc
@@ -72,12 +72,14 @@
// by the consent check in chromium, which happens when the events are read
// from disk.
//
- // The same applies to usb device and error metrics.
+ // The same applies to usb metrics.
if (event.project_name_hash() !=
events::rmad::ShimlessRmaReport::kProjectNameHash &&
event.project_name_hash() !=
events::usb_device::UsbDeviceInfo::kProjectNameHash &&
event.project_name_hash() !=
+ events::usb_session::UsbSessionEvent::kProjectNameHash &&
+ event.project_name_hash() !=
events::usb_error::HubError::kProjectNameHash &&
event.project_name_hash() !=
events::usb_error::XhciError::kProjectNameHash &&
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/libchrome-9999/work/libchrome-9999/platform2/libchrome/base/hash/md5_nacl.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/libchrome-9999/work/libchrome-9999/platform2/libchrome/base/hash/md5_nacl.h
deleted file mode 100644
index b1832d9..0000000
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/libchrome-9999/work/libchrome-9999/platform2/libchrome/base/hash/md5_nacl.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2019 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_HASH_MD5_NACL_H_
-#define BASE_HASH_MD5_NACL_H_
-
-#include <stdint.h>
-
-namespace base {
-
-// The output of an MD5 operation.
-struct MD5Digest {
- uint8_t a[16];
-};
-
-// Used for storing intermediate data during an MD5 computation. Callers
-// should not access the data.
-typedef char MD5Context[88];
-
-} // namespace base
-
-#endif // BASE_HASH_MD5_NACL_H_
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/metrics-9999/work/metrics-9999/platform2/metrics/structured/recorder_impl.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/metrics-9999/work/metrics-9999/platform2/metrics/structured/recorder_impl.cc
index 60ba5ae..e6b3800 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/metrics-9999/work/metrics-9999/platform2/metrics/structured/recorder_impl.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/metrics-9999/work/metrics-9999/platform2/metrics/structured/recorder_impl.cc
@@ -72,12 +72,14 @@
// by the consent check in chromium, which happens when the events are read
// from disk.
//
- // The same applies to usb device and error metrics.
+ // The same applies to usb metrics.
if (event.project_name_hash() !=
events::rmad::ShimlessRmaReport::kProjectNameHash &&
event.project_name_hash() !=
events::usb_device::UsbDeviceInfo::kProjectNameHash &&
event.project_name_hash() !=
+ events::usb_session::UsbSessionEvent::kProjectNameHash &&
+ event.project_name_hash() !=
events::usb_error::HubError::kProjectNameHash &&
event.project_name_hash() !=
events::usb_error::XhciError::kProjectNameHash &&
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/featured/feature_library_test.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/featured/feature_library_test.cc
index 70955e5..86f89ed 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/featured/feature_library_test.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/missive-9999/work/missive-9999/platform2/featured/feature_library_test.cc
@@ -314,6 +314,50 @@
EXPECT_EQ(enabled, features_->IsEnabledBlocking(f));
}
+TEST_P(FeatureLibraryParameterizedTest, IsEnabledBlockingWithTimeout_Success) {
+ int timeout = 100;
+ bool enabled = GetParam();
+
+ EXPECT_CALL(*mock_chrome_proxy_, CallMethodAndBlock(_, timeout))
+ .WillOnce(Invoke([this, enabled](dbus::MethodCall* call, int timeout_ms) {
+ return CreateIsEnabledResponse(call, enabled);
+ }));
+
+ VariationsFeature f{"Feature", FEATURE_DISABLED_BY_DEFAULT};
+ EXPECT_EQ(enabled, features_->IsEnabledBlockingWithTimeout(f, timeout));
+}
+
+TEST_P(FeatureLibraryParameterizedTest,
+ IsEnabledBlockingWithTimeout_Failure_Null) {
+ int timeout = 100;
+ EXPECT_CALL(*mock_chrome_proxy_, CallMethodAndBlock(_, timeout))
+ .WillOnce(Invoke(
+ [](dbus::MethodCall* call, int timeout_ms) { return nullptr; }));
+
+ bool enabled = GetParam();
+ FeatureState feature_state =
+ GetParam() ? FEATURE_ENABLED_BY_DEFAULT : FEATURE_DISABLED_BY_DEFAULT;
+ VariationsFeature f{"Feature", feature_state};
+
+ EXPECT_EQ(enabled, features_->IsEnabledBlockingWithTimeout(f, timeout));
+}
+
+TEST_P(FeatureLibraryParameterizedTest,
+ IsEnabledBlockingWithTimeout_Failure_Empty) {
+ int timeout = 100;
+ EXPECT_CALL(*mock_chrome_proxy_, CallMethodAndBlock(_, timeout))
+ .WillOnce(Invoke([](dbus::MethodCall* call, int timeout_ms) {
+ return dbus::Response::CreateEmpty();
+ }));
+
+ bool enabled = GetParam();
+ FeatureState feature_state =
+ GetParam() ? FEATURE_ENABLED_BY_DEFAULT : FEATURE_DISABLED_BY_DEFAULT;
+ VariationsFeature f{"Feature", feature_state};
+
+ EXPECT_EQ(enabled, features_->IsEnabledBlockingWithTimeout(f, timeout));
+}
+
TEST_F(FeatureLibraryTest, GetParamsAndEnabled_Success) {
// Will be enabled with params.
VariationsFeature f1{"Feature1", FEATURE_DISABLED_BY_DEFAULT};
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver.c b/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver.c
index 7fac786..187b7bf 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver.c
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver.c
@@ -102,14 +102,12 @@
*/
uint32_t pw_restart_count;
-#if BIOMETRICS_DEV
/* If non-zero, Pk establishment is blocked. The client should send a
* block_generate_ba_pk command after the client platform passed the stage
* that Pk establishment is allowed. This reduces the risk of active attackers
* trying to establish Pk with the server.
*/
int generate_ba_pk_blocked;
-#endif
/******************************************************************************/
/* Struct helper functions.
@@ -528,15 +526,11 @@
{
switch (minor_version) {
case 0:
-#if !BIOMETRICS_DEV
- return PW_LEAF_PAYLOAD_SIZE - PW_VALID_PCR_CRITERIA_SIZE;
-#else
return PW_LEAF_PAYLOAD_SIZE - PW_VALID_PCR_CRITERIA_SIZE
- PW_EXPIRATION_DATA_SIZE - sizeof(struct pw_leaf_type_t);
case 1:
return PW_LEAF_PAYLOAD_SIZE - PW_EXPIRATION_DATA_SIZE
- sizeof(struct pw_leaf_type_t);
-#endif
case PW_LEAF_MINOR_VERSION:
return PW_LEAF_PAYLOAD_SIZE;
default:
@@ -634,7 +628,6 @@
PW_VALID_PCR_CRITERIA_SIZE);
}
-#if BIOMETRICS_DEV
if (unimported_leaf_data->head.leaf_version.major == 0 &&
unimported_leaf_data->head.leaf_version.minor <= 1) {
/* Populate the leaf_data with default expiration timestamp value,
@@ -645,7 +638,6 @@
/* Populate the leaf_data with default leaf type. */
leaf_data->pub.leaf_type.v = PW_LEAF_TYPE_NORMAL;
}
-#endif
return EC_SUCCESS;
}
@@ -673,13 +665,11 @@
update_timestamp(¤t_time);
-#if BIOMETRICS_DEV
if (leaf_data->pub.expiration_delay_s.v != 0 &&
(leaf_data->pub.expiration_ts.boot_count != current_time.boot_count ||
leaf_data->pub.expiration_ts.timer_value <= current_time.timer_value)) {
return PW_ERR_EXPIRED;
}
-#endif
/* This loop ends when x is one greater than the index that applies. */
for (x = 0; x < ARRAY_SIZE(leaf_data->pub.delay_schedule); ++x) {
@@ -943,13 +933,11 @@
sizeof(entry->last_access_ts));
if (ret != EC_SUCCESS)
return ret;
-#if BIOMETRICS_DEV
ret = pinweaver_eal_memcpy_s(&entry->expiration_ts,
sizeof(entry->expiration_ts), &expiration_ts,
sizeof(entry->expiration_ts));
if (ret != EC_SUCCESS)
return ret;
-#endif
return store_log_data(&log);
}
@@ -989,8 +977,6 @@
return EC_SUCCESS;
}
-#if BIOMETRICS_DEV
-
static int generate_ba_secrets(const struct merkle_tree_t *merkle_tree,
uint8_t auth_channel,
uint8_t low_entropy_secret[PW_SECRET_SIZE],
@@ -1035,8 +1021,6 @@
return EC_SUCCESS;
}
-#endif
-
static int pw_handle_insert_leaf(struct merkle_tree_t *merkle_tree,
pw_request_insert_leaf_t *request,
uint16_t req_size,
@@ -1048,9 +1032,7 @@
struct wrapped_leaf_data_t wrapped_leaf_data = {};
const uint8_t empty_hash[PW_HASH_SIZE] = {};
uint8_t new_root[PW_HASH_SIZE];
-#if BIOMETRICS_DEV
uint32_t delay_s;
-#endif
if (req_size != sizeof(*request) +
get_path_auxiliary_hash_count(merkle_tree) *
@@ -1081,7 +1063,6 @@
if (ret != EC_SUCCESS)
return PW_ERR_INTERNAL_FAILURE;
-#if BIOMETRICS_DEV
if (request->expiration_delay_s.v != 0) {
update_timestamp(&leaf_data.pub.expiration_ts);
delay_s = request->expiration_delay_s.v;
@@ -1107,7 +1088,6 @@
} else if (request->leaf_type.v != PW_LEAF_TYPE_NORMAL) {
return PW_ERR_INTERNAL_FAILURE;
}
-#endif
ret = pinweaver_eal_memcpy_s(&leaf_data.sec.low_entropy_secret,
sizeof(leaf_data.sec.low_entropy_secret),
@@ -1266,13 +1246,11 @@
results_table[0].attempts = leaf_data.pub.attempt_count.v;
if (results_table[0].attempts != UINT32_MAX)
++results_table[0].attempts;
- #if BIOMETRICS_DEV
if (leaf_data.pub.leaf_type.v == PW_LEAF_TYPE_BIOMETRICS) {
/* Always increase attempts for biometrics limiter leaf type. */
results_table[1].ret = PW_ERR_SUCCESS_WITH_INCREMENT;
results_table[1].attempts = results_table[0].attempts;
}
- #endif
/**********************************************************************/
/* After this:
@@ -1296,9 +1274,7 @@
return ret;
-#if BIOMETRICS_DEV
expiration_ts = leaf_data.pub.expiration_ts;
-#endif
ret = log_auth(wrapped_leaf_data.pub.label, new_root,
results_table[auth_result].ret, leaf_data.pub.last_access_ts,
expiration_ts);
@@ -1358,9 +1334,7 @@
struct wrapped_leaf_data_t wrapped_leaf_data = {};
struct pw_timestamp_t expiration_ts = {};
uint8_t new_root[PW_HASH_SIZE];
-#if BIOMETRICS_DEV
uint32_t delay_s;
-#endif
if (req_size < sizeof(*request))
return PW_ERR_LENGTH_INVALID;
@@ -1384,7 +1358,6 @@
leaf_data.pub.attempt_count.v = 0;
-#if BIOMETRICS_DEV
if (request->strong_reset && leaf_data.pub.expiration_delay_s.v != 0) {
update_timestamp(&leaf_data.pub.expiration_ts);
delay_s = leaf_data.pub.expiration_delay_s.v;
@@ -1394,7 +1367,6 @@
leaf_data.pub.expiration_ts.timer_value = UINT64_MAX;
}
}
-#endif
ret = handle_leaf_update(merkle_tree, &leaf_data,
imported_leaf_data.hashes, &wrapped_leaf_data,
@@ -1402,9 +1374,7 @@
if (ret != EC_SUCCESS)
return ret;
-#if BIOMETRICS_DEV
expiration_ts = leaf_data.pub.expiration_ts;
-#endif
ret = log_auth(leaf_data.pub.label, new_root, ret,
leaf_data.pub.last_access_ts, expiration_ts);
if (ret != EC_SUCCESS)
@@ -1423,12 +1393,6 @@
if (ret != EC_SUCCESS)
return PW_ERR_INTERNAL_FAILURE;
-#if !BIOMETRICS_DEV
- ret = pinweaver_eal_memcpy_s(response->high_entropy_secret,
- sizeof(response->high_entropy_secret),
- leaf_data.sec.high_entropy_secret,
- sizeof(response->high_entropy_secret));
-#endif
if (ret != EC_SUCCESS)
return PW_ERR_INTERNAL_FAILURE;
@@ -1566,14 +1530,12 @@
sizeof(leaf_data.pub.last_access_ts));
if (ret != EC_SUCCESS)
return PW_ERR_INTERNAL_FAILURE;
-#if BIOMETRICS_DEV
ret = pinweaver_eal_memcpy_s(&leaf_data.pub.expiration_ts,
sizeof(leaf_data.pub.expiration_ts),
&log.entries[x].expiration_ts,
sizeof(leaf_data.pub.expiration_ts));
if (ret != EC_SUCCESS)
return PW_ERR_INTERNAL_FAILURE;
-#endif
ret = handle_leaf_update(merkle_tree, &leaf_data,
imported_leaf_data.hashes, &wrapped_leaf_data,
@@ -1596,7 +1558,6 @@
return EC_SUCCESS;
}
-#if BIOMETRICS_DEV
static int pw_handle_sys_info(pw_response_sys_info_t *response,
uint16_t *response_size)
{
@@ -1843,7 +1804,6 @@
generate_ba_pk_blocked = 1;
return EC_SUCCESS;
}
-#endif
struct merkle_tree_t pw_merkle_tree;
@@ -1854,9 +1814,7 @@
void pinweaver_init(void)
{
load_merkle_tree(&pw_merkle_tree);
-#if BIOMETRICS_DEV
generate_ba_pk_blocked = 0;
-#endif
}
int get_path_auxiliary_hash_count(const struct merkle_tree_t *merkle_tree)
@@ -1944,7 +1902,6 @@
}
/* Fallthrough to make compatible from next version */
__attribute__((fallthrough));
-#if BIOMETRICS_DEV
case 1:
/* The switch from protocol version 1 to 2 means all the
* requests have the same format, except insert_leaf and
@@ -1990,7 +1947,6 @@
}
/* Fallthrough to make compatible from next version */
__attribute__((fallthrough));
-#endif
case PW_PROTOCOL_VERSION:
return 1;
}
@@ -2003,9 +1959,7 @@
void make_compatible_response(int version, int req_type,
struct pw_response_t *response)
{
-#if BIOMETRICS_DEV
size_t offset;
-#endif
if (version >= PW_PROTOCOL_VERSION)
return;
@@ -2024,7 +1978,6 @@
}
}
-#if BIOMETRICS_DEV
if (version <= 1) {
if (req_type == PW_GET_LOG) {
for (offset = 0;
@@ -2057,7 +2010,6 @@
response->header.data_length += PW_SECRET_SIZE;
}
}
-#endif
}
enum pinweaver_command_res_t pinweaver_command(void *request_buf,
@@ -2168,7 +2120,6 @@
&response->data.log_replay,
&resp_length);
break;
-#if BIOMETRICS_DEV
case PW_SYS_INFO:
ret = pw_handle_sys_info(&response->data.sys_info, &resp_length);
break;
@@ -2189,7 +2140,6 @@
case PW_BLOCK_GENERATE_BA_PK:
ret = pw_handle_block_generate_ba_pk();
break;
-#endif
default:
ret = PW_ERR_TYPE_INVALID;
break;
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver_eal.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver_eal.h
index c331394..59b5dbf 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver_eal.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver_eal.h
@@ -20,10 +20,6 @@
extern "C" {
#endif
-#ifndef BIOMETRICS_DEV
-#error BIOMETRICS_DEV needs to be defined.
-#endif
-
/* Implements memcpy_s on all platforms
*/
int pinweaver_eal_memcpy_s(
@@ -138,8 +134,6 @@
int pinweaver_eal_storage_set_tree_data(
const struct pw_long_term_storage_t *data);
-#if BIOMETRICS_DEV
-
/* Biometrics vendor functions. */
/*
@@ -167,8 +161,6 @@
void *secret, size_t *secret_size,
struct pw_ba_ecc_pt_t *ecc_pt_out);
-#endif
-
#ifdef __cplusplus
}
#endif
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver_types.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver_types.h
index fcc6212..303d6bf 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver_types.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/pinweaver-9999/work/pinweaver-9999/platform2/pinweaver/pinweaver_types.h
@@ -16,27 +16,15 @@
extern "C" {
#endif
-#ifndef BIOMETRICS_DEV
-#error BIOMETRICS_DEV needs to be defined.
-#endif
-
#define PW_PACKED __packed
-#if BIOMETRICS_DEV
#define PW_PROTOCOL_VERSION 2
-#else
-#define PW_PROTOCOL_VERSION 1
-#endif
#define PW_LEAF_MAJOR_VERSION 0
/* The change from version zero to one is the addition of valid_pcr_value
* metadata. The change from version one to two is the addition of the
* expiration timestamp.
*/
-#if BIOMETRICS_DEV
#define PW_LEAF_MINOR_VERSION 2
-#else
-#define PW_LEAF_MINOR_VERSION 1
-#endif
#define PW_MAX_MESSAGE_SIZE (2048 - 12 /* sizeof(struct tpm_cmd_header) */)
@@ -47,14 +35,10 @@
#define PW_ALIGN_TO_BLK __aligned(PW_WRAP_BLOCK_SIZE)
-#if BIOMETRICS_DEV
-
#define PW_BA_ECC_CORD_SIZE 32
#define PW_BA_PK_ENTRY_COUNT 2
-#endif
-
#define PW_HMAC_IV_SIZE_V1 4
#define PW_HMAC_IV_SIZE_V2 PW_WRAP_BLOCK_SIZE
@@ -80,7 +64,6 @@
PW_ERR_NV_VERSION_MISMATCH,
PW_ERR_PCR_NOT_MATCH,
PW_ERR_INTERNAL_FAILURE,
-#if BIOMETRICS_DEV
PW_ERR_EXPIRED,
PW_ERR_BIO_AUTH_CHANNEL_INVALID,
PW_ERR_BIO_AUTH_PUBLIC_KEY_VERSION_MISMATCH,
@@ -92,7 +75,6 @@
* when logging a try_auth event like this.
*/
PW_ERR_SUCCESS_WITH_INCREMENT,
-#endif
};
/* Represents the log2(fan out) of a tree. */
@@ -177,8 +159,6 @@
*/
#define PW_SECRET_SIZE 32
-#if BIOMETRICS_DEV
-
enum pw_leaf_type_enum {
PW_LEAF_TYPE_NORMAL,
PW_LEAF_TYPE_BIOMETRICS,
@@ -188,9 +168,6 @@
uint8_t v;
};
-#endif
-
-
struct PW_PACKED leaf_version_t {
/* minor comes first so this struct will be compatibile with uint32_t
* comparisons for little endian to make version comparisons easier.
@@ -232,13 +209,11 @@
struct attempt_count_t attempt_count;
struct valid_pcr_value_t valid_pcr_criteria[PW_MAX_PCR_CRITERIA_COUNT];
-#if BIOMETRICS_DEV
/* Timestamp when the leaf data expires. */
struct pw_timestamp_t expiration_ts;
/* Used to update expiration_ts after reset leaf */
struct time_diff_t expiration_delay_s;
struct pw_leaf_type_t leaf_type;
-#endif
};
/* Represents a struct of unknown length to be imported to process a request. */
@@ -266,8 +241,6 @@
uint8_t payload[];
};
-#if BIOMETRICS_DEV
-
/* Biometrics specific types. */
struct PW_PACKED pw_ba_pk_t {
@@ -284,8 +257,6 @@
struct pw_ba_ecc_pt_t pt;
};
-#endif
-
/******************************************************************************/
/* Message structs
*
@@ -305,7 +276,6 @@
PW_RESET_AUTH = 5,
PW_GET_LOG = 6,
PW_LOG_REPLAY = 7,
-#if BIOMETRICS_DEV
PW_SYS_INFO = 8,
/* The following are vendor specific pinweaver commands
* for biometrics feature.
@@ -313,7 +283,6 @@
PW_GENERATE_BA_PK = 9,
PW_START_BIO_AUTH = 10,
PW_BLOCK_GENERATE_BA_PK = 11,
-#endif
};
/* This enum is introduced because when we need a new variant in the log for
@@ -331,19 +300,13 @@
/* All the fields above correspond to the same kind of message with matching
* value in pw_message_type_enum.
*/
-#if BIOMETRICS_DEV
LOG_PW_TRY_AUTH02 = 5,
-#endif
LOG_PW_MT_INVALID = LOG_PW_MT_INVALID00,
LOG_PW_RESET_TREE = LOG_PW_RESET_TREE00,
LOG_PW_INSERT_LEAF = LOG_PW_INSERT_LEAF00,
LOG_PW_REMOVE_LEAF = LOG_PW_REMOVE_LEAF00,
-#if BIOMETRICS_DEV
LOG_PW_TRY_AUTH = LOG_PW_TRY_AUTH02,
-#else
- LOG_PW_TRY_AUTH = LOG_PW_TRY_AUTH00,
-#endif
};
struct PW_PACKED pw_message_type_t {
@@ -405,7 +368,6 @@
uint8_t path_hashes[][PW_HASH_SIZE];
};
-#if BIOMETRICS_DEV
struct PW_PACKED pw_request_insert_leaf02_t {
struct label_t label;
struct delay_schedule_entry_t delay_schedule[PW_SCHED_COUNT];
@@ -429,10 +391,6 @@
};
typedef struct pw_request_insert_leaf02_t pw_request_insert_leaf_t;
-#else
-typedef struct pw_request_insert_leaf01_t pw_request_insert_leaf_t;
-#endif
-
struct PW_PACKED pw_response_insert_leaf00_t {
struct unimported_leaf_data_t unimported_leaf_data;
@@ -487,7 +445,6 @@
struct unimported_leaf_data_t unimported_leaf_data;
};
-#if BIOMETRICS_DEV
struct PW_PACKED pw_request_reset_auth02_t {
uint8_t reset_secret[PW_SECRET_SIZE];
/* If strong_reset is non-zero, the expiration timestamp will be reset too. */
@@ -496,9 +453,6 @@
};
typedef struct pw_request_reset_auth02_t pw_request_reset_auth_t;
-#else
-typedef struct pw_request_reset_auth00_t pw_request_reset_auth_t;
-#endif
/* This is only used for parsing incoming data before version 02 */
struct PW_PACKED pw_response_reset_auth00_t {
@@ -506,16 +460,12 @@
struct unimported_leaf_data_t unimported_leaf_data;
};
-#if BIOMETRICS_DEV
struct PW_PACKED pw_response_reset_auth02_t {
/* Starting from protocol version 2, HEC isn't returned in reset_auth. */
struct unimported_leaf_data_t unimported_leaf_data;
};
typedef struct pw_response_reset_auth02_t pw_response_reset_auth_t;
-#else
-typedef struct pw_response_reset_auth00_t pw_response_reset_auth_t;
-#endif
struct PW_PACKED pw_request_get_log00_t {
/* The root on the CrOS side that needs to be brought back in sync with
@@ -571,14 +521,11 @@
* variant but used another variant type to distinguish whether this field
* exists.
*/
-#if BIOMETRICS_DEV
struct pw_timestamp_t expiration_ts;
-#endif
};
};
};
-#if BIOMETRICS_DEV
struct PW_PACKED pw_response_sys_info02_t {
struct pw_timestamp_t current_ts;
};
@@ -634,8 +581,6 @@
typedef struct pw_response_start_bio_auth02_t pw_response_start_bio_auth_t;
-#endif
-
struct PW_PACKED pw_request_t {
struct pw_request_header_t header;
union {
@@ -643,21 +588,15 @@
struct pw_request_reset_tree00_t reset_tree00;
struct pw_request_insert_leaf00_t insert_leaf00;
struct pw_request_insert_leaf01_t insert_leaf01;
-#if BIOMETRICS_DEV
struct pw_request_insert_leaf02_t insert_leaf02;
-#endif
struct pw_request_remove_leaf00_t remove_leaf00;
struct pw_request_try_auth00_t try_auth00;
struct pw_request_reset_auth00_t reset_auth00;
-#if BIOMETRICS_DEV
struct pw_request_reset_auth02_t reset_auth02;
-#endif
struct pw_request_get_log00_t get_log00;
struct pw_request_log_replay00_t log_replay00;
-#if BIOMETRICS_DEV
struct pw_request_generate_ba_pk02_t generate_pk02;
struct pw_request_start_bio_auth02_t start_bio_auth02;
-#endif
/* currently used types */
pw_request_reset_tree_t reset_tree;
@@ -667,10 +606,8 @@
pw_request_reset_auth_t reset_auth;
pw_request_get_log_t get_log;
pw_request_log_replay_t log_replay;
-#if BIOMETRICS_DEV
pw_request_generate_ba_pk_t generate_pk;
pw_request_start_bio_auth_t start_bio_auth;
-#endif
} data;
};
@@ -682,30 +619,24 @@
struct pw_response_try_auth00_t try_auth00;
struct pw_response_try_auth01_t try_auth01;
struct pw_response_reset_auth00_t reset_auth00;
-#if BIOMETRICS_DEV
struct pw_response_reset_auth02_t reset_auth02;
-#endif
/* An array with as many entries as are present in the log up to
* the present time or will fit in the message.
*/
uint8_t get_log[0];
struct pw_response_log_replay00_t log_replay00;
-#if BIOMETRICS_DEV
struct pw_response_sys_info02_t sys_info02;
struct pw_response_generate_ba_pk02_t generate_pk02;
struct pw_response_start_bio_auth02_t start_bio_auth02;
-#endif
/* currently used types */
pw_response_insert_leaf_t insert_leaf;
pw_response_try_auth_t try_auth;
pw_response_reset_auth_t reset_auth;
pw_response_log_replay_t log_replay;
-#if BIOMETRICS_DEV
pw_response_sys_info_t sys_info;
pw_response_generate_ba_pk_t generate_pk;
pw_response_start_bio_auth_t start_bio_auth;
-#endif
} data;
};
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/secagentd-9999/work/secagentd-9999/platform2/featured/feature_library_test.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/secagentd-9999/work/secagentd-9999/platform2/featured/feature_library_test.cc
index 70955e5..86f89ed 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/secagentd-9999/work/secagentd-9999/platform2/featured/feature_library_test.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/secagentd-9999/work/secagentd-9999/platform2/featured/feature_library_test.cc
@@ -314,6 +314,50 @@
EXPECT_EQ(enabled, features_->IsEnabledBlocking(f));
}
+TEST_P(FeatureLibraryParameterizedTest, IsEnabledBlockingWithTimeout_Success) {
+ int timeout = 100;
+ bool enabled = GetParam();
+
+ EXPECT_CALL(*mock_chrome_proxy_, CallMethodAndBlock(_, timeout))
+ .WillOnce(Invoke([this, enabled](dbus::MethodCall* call, int timeout_ms) {
+ return CreateIsEnabledResponse(call, enabled);
+ }));
+
+ VariationsFeature f{"Feature", FEATURE_DISABLED_BY_DEFAULT};
+ EXPECT_EQ(enabled, features_->IsEnabledBlockingWithTimeout(f, timeout));
+}
+
+TEST_P(FeatureLibraryParameterizedTest,
+ IsEnabledBlockingWithTimeout_Failure_Null) {
+ int timeout = 100;
+ EXPECT_CALL(*mock_chrome_proxy_, CallMethodAndBlock(_, timeout))
+ .WillOnce(Invoke(
+ [](dbus::MethodCall* call, int timeout_ms) { return nullptr; }));
+
+ bool enabled = GetParam();
+ FeatureState feature_state =
+ GetParam() ? FEATURE_ENABLED_BY_DEFAULT : FEATURE_DISABLED_BY_DEFAULT;
+ VariationsFeature f{"Feature", feature_state};
+
+ EXPECT_EQ(enabled, features_->IsEnabledBlockingWithTimeout(f, timeout));
+}
+
+TEST_P(FeatureLibraryParameterizedTest,
+ IsEnabledBlockingWithTimeout_Failure_Empty) {
+ int timeout = 100;
+ EXPECT_CALL(*mock_chrome_proxy_, CallMethodAndBlock(_, timeout))
+ .WillOnce(Invoke([](dbus::MethodCall* call, int timeout_ms) {
+ return dbus::Response::CreateEmpty();
+ }));
+
+ bool enabled = GetParam();
+ FeatureState feature_state =
+ GetParam() ? FEATURE_ENABLED_BY_DEFAULT : FEATURE_DISABLED_BY_DEFAULT;
+ VariationsFeature f{"Feature", feature_state};
+
+ EXPECT_EQ(enabled, features_->IsEnabledBlockingWithTimeout(f, timeout));
+}
+
TEST_F(FeatureLibraryTest, GetParamsAndEnabled_Success) {
// Will be enabled with params.
VariationsFeature f1{"Feature1", FEATURE_DISABLED_BY_DEFAULT};
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/common-mk/example/component/component.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/common-mk/example/component/component.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/common-mk/example/component/component.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/common-mk/example/component/component.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/common-mk/example/include/component/component.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/common-mk/example/include/component/component.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/common-mk/example/include/component/component.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/common-mk/example/include/component/component.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/common-mk/testrunner.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/common-mk/testrunner.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/common-mk/testrunner.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/common-mk/testrunner.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/common-mk/testrunner.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/common-mk/testrunner.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/common-mk/testrunner.h
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/common-mk/testrunner.h
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/syslog-cat/main.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/syslog-cat/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r252/work/syslog-cat-0.0.1/syslog-cat/main.cc
rename to chroot/build/amd64-generic/tmp/portage/chromeos-base/syslog-cat-0.0.1-r253/work/syslog-cat-0.0.1/syslog-cat/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/system_api-9999/work/build/out/Default/gen/include/vm_concierge/concierge_service.pb.cc b/chroot/build/amd64-generic/tmp/portage/chromeos-base/system_api-9999/work/build/out/Default/gen/include/vm_concierge/concierge_service.pb.cc
index e1cdb6c..3063f54 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/system_api-9999/work/build/out/Default/gen/include/vm_concierge/concierge_service.pb.cc
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/system_api-9999/work/build/out/Default/gen/include/vm_concierge/concierge_service.pb.cc
@@ -100,7 +100,6 @@
, /*decltype(_impl_.features_)*/{}
, /*decltype(_impl_._features_cached_byte_size_)*/{0}
, /*decltype(_impl_.oem_strings_)*/{}
- , /*decltype(_impl_.shared_directory_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
, /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
, /*decltype(_impl_.owner_id_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
, /*decltype(_impl_.vm_username_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
@@ -153,7 +152,6 @@
PROTOBUF_CONSTEXPR StartArcVmRequest::StartArcVmRequest(
::_pbi::ConstantInitialized): _impl_{
/*decltype(_impl_.disks_)*/{}
- , /*decltype(_impl_.params_)*/{}
, /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
, /*decltype(_impl_.owner_id_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
, /*decltype(_impl_.fstab_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
@@ -166,33 +164,24 @@
, /*decltype(_impl_.use_hugepages_)*/false
, /*decltype(_impl_.memory_mib_)*/0u
, /*decltype(_impl_.rootfs_block_size_)*/0u
- , /*decltype(_impl_.use_per_vm_core_scheduling_)*/false
- , /*decltype(_impl_.enable_consumer_auto_update_toggle_)*/false
- , /*decltype(_impl_.lock_guest_memory_)*/false
- , /*decltype(_impl_.enable_arc_file_picker_experiment_)*/false
, /*decltype(_impl_.panel_orientation_)*/0
- , /*decltype(_impl_.enable_custom_tabs_experiment_)*/false
+ , /*decltype(_impl_.use_per_vm_core_scheduling_)*/false
+ , /*decltype(_impl_.lock_guest_memory_)*/false
, /*decltype(_impl_.enable_keyboard_shortcut_helper_integration_)*/false
- , /*decltype(_impl_.enable_notifications_refresh_)*/false
- , /*decltype(_impl_.enable_tts_caching_)*/false
- , /*decltype(_impl_.logd_config_size_)*/0
- , /*decltype(_impl_.enable_gmscore_lmk_protection_)*/false
, /*decltype(_impl_.enable_broadcast_anr_prenotify_)*/false
- , /*decltype(_impl_.enable_virtio_blk_data_)*/false
- , /*decltype(_impl_.disable_media_store_maintenance_)*/false
+ , /*decltype(_impl_.logd_config_size_)*/0
, /*decltype(_impl_.vm_memory_psi_period_)*/0
, /*decltype(_impl_.guest_zram_size_)*/0
, /*decltype(_impl_.guest_swappiness_)*/0
- , /*decltype(_impl_.arc_generate_play_auto_install_)*/false
- , /*decltype(_impl_.disable_download_provider_)*/false
- , /*decltype(_impl_.update_o4c_list_via_a2c2_)*/false
- , /*decltype(_impl_.enable_rw_)*/false
, /*decltype(_impl_.mglru_reclaim_interval_)*/0
, /*decltype(_impl_.mglru_reclaim_swappiness_)*/0
+ , /*decltype(_impl_.enable_virtio_blk_data_)*/false
+ , /*decltype(_impl_.update_o4c_list_via_a2c2_)*/false
+ , /*decltype(_impl_.enable_rw_)*/false
+ , /*decltype(_impl_.enable_web_view_zygote_lazy_init_)*/false
, /*decltype(_impl_.usap_profile_)*/0
, /*decltype(_impl_.native_bridge_experiment_)*/0
, /*decltype(_impl_.ureadahead_mode_)*/0
- , /*decltype(_impl_.enable_web_view_zygote_lazy_init_)*/false
, /*decltype(_impl_.enable_vmm_swap_)*/false
, /*decltype(_impl_._cached_size_)*/{}} {}
struct StartArcVmRequestDefaultTypeInternal {
@@ -4048,7 +4037,6 @@
, decltype(_impl_.features_){from._impl_.features_}
, /*decltype(_impl_._features_cached_byte_size_)*/{0}
, decltype(_impl_.oem_strings_){from._impl_.oem_strings_}
- , decltype(_impl_.shared_directory_){}
, decltype(_impl_.name_){}
, decltype(_impl_.owner_id_){}
, decltype(_impl_.vm_username_){}
@@ -4071,14 +4059,6 @@
, /*decltype(_impl_._cached_size_)*/{}};
_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_);
- _impl_.shared_directory_.InitDefault();
- #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
- _impl_.shared_directory_.Set("", GetArenaForAllocation());
- #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
- if (!from._internal_shared_directory().empty()) {
- _this->_impl_.shared_directory_.Set(from._internal_shared_directory(),
- _this->GetArenaForAllocation());
- }
_impl_.name_.InitDefault();
#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
_impl_.name_.Set("", GetArenaForAllocation());
@@ -4124,7 +4104,6 @@
, decltype(_impl_.features_){arena}
, /*decltype(_impl_._features_cached_byte_size_)*/{0}
, decltype(_impl_.oem_strings_){arena}
- , decltype(_impl_.shared_directory_){}
, decltype(_impl_.name_){}
, decltype(_impl_.owner_id_){}
, decltype(_impl_.vm_username_){}
@@ -4146,10 +4125,6 @@
, decltype(_impl_.vm_type_){0}
, /*decltype(_impl_._cached_size_)*/{}
};
- _impl_.shared_directory_.InitDefault();
- #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
- _impl_.shared_directory_.Set("", GetArenaForAllocation());
- #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
_impl_.name_.InitDefault();
#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
_impl_.name_.Set("", GetArenaForAllocation());
@@ -4180,7 +4155,6 @@
_impl_.kernel_params_.~RepeatedPtrField();
_impl_.features_.~RepeatedField();
_impl_.oem_strings_.~RepeatedPtrField();
- _impl_.shared_directory_.Destroy();
_impl_.name_.Destroy();
_impl_.owner_id_.Destroy();
_impl_.vm_username_.Destroy();
@@ -4202,7 +4176,6 @@
_impl_.kernel_params_.Clear();
_impl_.features_.Clear();
_impl_.oem_strings_.Clear();
- _impl_.shared_directory_.ClearToEmpty();
_impl_.name_.ClearToEmpty();
_impl_.owner_id_.ClearToEmpty();
_impl_.vm_username_.ClearToEmpty();
@@ -4243,16 +4216,6 @@
} else
goto handle_unusual;
continue;
- // string shared_directory = 3 [deprecated = true];
- case 3:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
- auto str = _internal_mutable_shared_directory();
- ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
- CHK_(ptr);
- CHK_(::_pbi::VerifyUTF8(str, nullptr));
- } else
- goto handle_unusual;
- continue;
// string name = 4;
case 4:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
@@ -4502,16 +4465,6 @@
InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
}
- // string shared_directory = 3 [deprecated = true];
- if (!this->_internal_shared_directory().empty()) {
- ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
- this->_internal_shared_directory().data(), static_cast<int>(this->_internal_shared_directory().length()),
- ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
- "vm_tools.concierge.StartVmRequest.shared_directory");
- target = stream->WriteStringMaybeAliased(
- 3, this->_internal_shared_directory(), target);
- }
-
// string name = 4;
if (!this->_internal_name().empty()) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
@@ -4744,13 +4697,6 @@
_impl_.oem_strings_.Get(i));
}
- // string shared_directory = 3 [deprecated = true];
- if (!this->_internal_shared_directory().empty()) {
- total_size += 1 +
- ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
- this->_internal_shared_directory());
- }
-
// string name = 4;
if (!this->_internal_name().empty()) {
total_size += 1 +
@@ -4883,9 +4829,6 @@
_this->_impl_.kernel_params_.MergeFrom(from._impl_.kernel_params_);
_this->_impl_.features_.MergeFrom(from._impl_.features_);
_this->_impl_.oem_strings_.MergeFrom(from._impl_.oem_strings_);
- if (!from._internal_shared_directory().empty()) {
- _this->_internal_set_shared_directory(from._internal_shared_directory());
- }
if (!from._internal_name().empty()) {
_this->_internal_set_name(from._internal_name());
}
@@ -4969,10 +4912,6 @@
_impl_.features_.InternalSwap(&other->_impl_.features_);
_impl_.oem_strings_.InternalSwap(&other->_impl_.oem_strings_);
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
- &_impl_.shared_directory_, lhs_arena,
- &other->_impl_.shared_directory_, rhs_arena
- );
- ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
&_impl_.name_, lhs_arena,
&other->_impl_.name_, rhs_arena
);
@@ -5494,7 +5433,6 @@
StartArcVmRequest* const _this = this; (void)_this;
new (&_impl_) Impl_{
decltype(_impl_.disks_){from._impl_.disks_}
- , decltype(_impl_.params_){from._impl_.params_}
, decltype(_impl_.name_){}
, decltype(_impl_.owner_id_){}
, decltype(_impl_.fstab_){}
@@ -5507,33 +5445,24 @@
, decltype(_impl_.use_hugepages_){}
, decltype(_impl_.memory_mib_){}
, decltype(_impl_.rootfs_block_size_){}
- , decltype(_impl_.use_per_vm_core_scheduling_){}
- , decltype(_impl_.enable_consumer_auto_update_toggle_){}
- , decltype(_impl_.lock_guest_memory_){}
- , decltype(_impl_.enable_arc_file_picker_experiment_){}
, decltype(_impl_.panel_orientation_){}
- , decltype(_impl_.enable_custom_tabs_experiment_){}
+ , decltype(_impl_.use_per_vm_core_scheduling_){}
+ , decltype(_impl_.lock_guest_memory_){}
, decltype(_impl_.enable_keyboard_shortcut_helper_integration_){}
- , decltype(_impl_.enable_notifications_refresh_){}
- , decltype(_impl_.enable_tts_caching_){}
- , decltype(_impl_.logd_config_size_){}
- , decltype(_impl_.enable_gmscore_lmk_protection_){}
, decltype(_impl_.enable_broadcast_anr_prenotify_){}
- , decltype(_impl_.enable_virtio_blk_data_){}
- , decltype(_impl_.disable_media_store_maintenance_){}
+ , decltype(_impl_.logd_config_size_){}
, decltype(_impl_.vm_memory_psi_period_){}
, decltype(_impl_.guest_zram_size_){}
, decltype(_impl_.guest_swappiness_){}
- , decltype(_impl_.arc_generate_play_auto_install_){}
- , decltype(_impl_.disable_download_provider_){}
- , decltype(_impl_.update_o4c_list_via_a2c2_){}
- , decltype(_impl_.enable_rw_){}
, decltype(_impl_.mglru_reclaim_interval_){}
, decltype(_impl_.mglru_reclaim_swappiness_){}
+ , decltype(_impl_.enable_virtio_blk_data_){}
+ , decltype(_impl_.update_o4c_list_via_a2c2_){}
+ , decltype(_impl_.enable_rw_){}
+ , decltype(_impl_.enable_web_view_zygote_lazy_init_){}
, decltype(_impl_.usap_profile_){}
, decltype(_impl_.native_bridge_experiment_){}
, decltype(_impl_.ureadahead_mode_){}
- , decltype(_impl_.enable_web_view_zygote_lazy_init_){}
, decltype(_impl_.enable_vmm_swap_){}
, /*decltype(_impl_._cached_size_)*/{}};
@@ -5580,7 +5509,6 @@
(void)is_message_owned;
new (&_impl_) Impl_{
decltype(_impl_.disks_){arena}
- , decltype(_impl_.params_){arena}
, decltype(_impl_.name_){}
, decltype(_impl_.owner_id_){}
, decltype(_impl_.fstab_){}
@@ -5593,33 +5521,24 @@
, decltype(_impl_.use_hugepages_){false}
, decltype(_impl_.memory_mib_){0u}
, decltype(_impl_.rootfs_block_size_){0u}
- , decltype(_impl_.use_per_vm_core_scheduling_){false}
- , decltype(_impl_.enable_consumer_auto_update_toggle_){false}
- , decltype(_impl_.lock_guest_memory_){false}
- , decltype(_impl_.enable_arc_file_picker_experiment_){false}
, decltype(_impl_.panel_orientation_){0}
- , decltype(_impl_.enable_custom_tabs_experiment_){false}
+ , decltype(_impl_.use_per_vm_core_scheduling_){false}
+ , decltype(_impl_.lock_guest_memory_){false}
, decltype(_impl_.enable_keyboard_shortcut_helper_integration_){false}
- , decltype(_impl_.enable_notifications_refresh_){false}
- , decltype(_impl_.enable_tts_caching_){false}
- , decltype(_impl_.logd_config_size_){0}
- , decltype(_impl_.enable_gmscore_lmk_protection_){false}
, decltype(_impl_.enable_broadcast_anr_prenotify_){false}
- , decltype(_impl_.enable_virtio_blk_data_){false}
- , decltype(_impl_.disable_media_store_maintenance_){false}
+ , decltype(_impl_.logd_config_size_){0}
, decltype(_impl_.vm_memory_psi_period_){0}
, decltype(_impl_.guest_zram_size_){0}
, decltype(_impl_.guest_swappiness_){0}
- , decltype(_impl_.arc_generate_play_auto_install_){false}
- , decltype(_impl_.disable_download_provider_){false}
- , decltype(_impl_.update_o4c_list_via_a2c2_){false}
- , decltype(_impl_.enable_rw_){false}
, decltype(_impl_.mglru_reclaim_interval_){0}
, decltype(_impl_.mglru_reclaim_swappiness_){0}
+ , decltype(_impl_.enable_virtio_blk_data_){false}
+ , decltype(_impl_.update_o4c_list_via_a2c2_){false}
+ , decltype(_impl_.enable_rw_){false}
+ , decltype(_impl_.enable_web_view_zygote_lazy_init_){false}
, decltype(_impl_.usap_profile_){0}
, decltype(_impl_.native_bridge_experiment_){0}
, decltype(_impl_.ureadahead_mode_){0}
- , decltype(_impl_.enable_web_view_zygote_lazy_init_){false}
, decltype(_impl_.enable_vmm_swap_){false}
, /*decltype(_impl_._cached_size_)*/{}
};
@@ -5649,7 +5568,6 @@
inline void StartArcVmRequest::SharedDtor() {
GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
_impl_.disks_.~RepeatedPtrField();
- _impl_.params_.~RepeatedPtrField();
_impl_.name_.Destroy();
_impl_.owner_id_.Destroy();
_impl_.fstab_.Destroy();
@@ -5668,7 +5586,6 @@
(void) cached_has_bits;
_impl_.disks_.Clear();
- _impl_.params_.Clear();
_impl_.name_.ClearToEmpty();
_impl_.owner_id_.ClearToEmpty();
_impl_.fstab_.ClearToEmpty();
@@ -5733,21 +5650,6 @@
} else
goto handle_unusual;
continue;
- // repeated string params = 5 [deprecated = true];
- case 5:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
- ptr -= 1;
- do {
- ptr += 1;
- auto str = _internal_add_params();
- ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
- CHK_(ptr);
- CHK_(::_pbi::VerifyUTF8(str, nullptr));
- if (!ctx->DataAvailable(ptr)) break;
- } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<42>(ptr));
- } else
- goto handle_unusual;
- continue;
// string fstab = 6;
case 6:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
@@ -5822,14 +5724,6 @@
} else
goto handle_unusual;
continue;
- // bool enable_consumer_auto_update_toggle = 16 [deprecated = true];
- case 16:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 128)) {
- _impl_.enable_consumer_auto_update_toggle_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
- CHK_(ptr);
- } else
- goto handle_unusual;
- continue;
// .vm_tools.concierge.StartArcVmRequest.DisplayOrientation panel_orientation = 17;
case 17:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 136)) {
@@ -5847,22 +5741,6 @@
} else
goto handle_unusual;
continue;
- // bool enable_arc_file_picker_experiment = 19 [deprecated = true];
- case 19:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 152)) {
- _impl_.enable_arc_file_picker_experiment_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
- CHK_(ptr);
- } else
- goto handle_unusual;
- continue;
- // bool enable_custom_tabs_experiment = 20 [deprecated = true];
- case 20:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 160)) {
- _impl_.enable_custom_tabs_experiment_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
- CHK_(ptr);
- } else
- goto handle_unusual;
- continue;
// bool enable_keyboard_shortcut_helper_integration = 21;
case 21:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 168)) {
@@ -5871,30 +5749,6 @@
} else
goto handle_unusual;
continue;
- // bool enable_notifications_refresh = 22 [deprecated = true];
- case 22:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 176)) {
- _impl_.enable_notifications_refresh_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
- CHK_(ptr);
- } else
- goto handle_unusual;
- continue;
- // bool enable_tts_caching = 23 [deprecated = true];
- case 23:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 184)) {
- _impl_.enable_tts_caching_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
- CHK_(ptr);
- } else
- goto handle_unusual;
- continue;
- // bool enable_gmscore_lmk_protection = 24 [deprecated = true];
- case 24:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 192)) {
- _impl_.enable_gmscore_lmk_protection_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
- CHK_(ptr);
- } else
- goto handle_unusual;
- continue;
// bool enable_broadcast_anr_prenotify = 25;
case 25:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 200)) {
@@ -5927,30 +5781,6 @@
} else
goto handle_unusual;
continue;
- // bool disable_media_store_maintenance = 29 [deprecated = true];
- case 29:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 232)) {
- _impl_.disable_media_store_maintenance_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
- CHK_(ptr);
- } else
- goto handle_unusual;
- continue;
- // bool arc_generate_play_auto_install = 30 [deprecated = true];
- case 30:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 240)) {
- _impl_.arc_generate_play_auto_install_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
- CHK_(ptr);
- } else
- goto handle_unusual;
- continue;
- // bool disable_download_provider = 31 [deprecated = true];
- case 31:
- if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 248)) {
- _impl_.disable_download_provider_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
- CHK_(ptr);
- } else
- goto handle_unusual;
- continue;
// int32 guest_zram_size = 32;
case 32:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 0)) {
@@ -6114,16 +5944,6 @@
4, this->_internal_owner_id(), target);
}
- // repeated string params = 5 [deprecated = true];
- for (int i = 0, n = this->_internal_params_size(); i < n; i++) {
- const auto& s = this->_internal_params(i);
- ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
- s.data(), static_cast<int>(s.length()),
- ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
- "vm_tools.concierge.StartArcVmRequest.params");
- target = stream->WriteString(5, s, target);
- }
-
// string fstab = 6;
if (!this->_internal_fstab().empty()) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
@@ -6182,12 +6002,6 @@
target = ::_pbi::WireFormatLite::WriteUInt32ToArray(15, this->_internal_rootfs_block_size(), target);
}
- // bool enable_consumer_auto_update_toggle = 16 [deprecated = true];
- if (this->_internal_enable_consumer_auto_update_toggle() != 0) {
- target = stream->EnsureSpace(target);
- target = ::_pbi::WireFormatLite::WriteBoolToArray(16, this->_internal_enable_consumer_auto_update_toggle(), target);
- }
-
// .vm_tools.concierge.StartArcVmRequest.DisplayOrientation panel_orientation = 17;
if (this->_internal_panel_orientation() != 0) {
target = stream->EnsureSpace(target);
@@ -6201,42 +6015,12 @@
target = ::_pbi::WireFormatLite::WriteBoolToArray(18, this->_internal_lock_guest_memory(), target);
}
- // bool enable_arc_file_picker_experiment = 19 [deprecated = true];
- if (this->_internal_enable_arc_file_picker_experiment() != 0) {
- target = stream->EnsureSpace(target);
- target = ::_pbi::WireFormatLite::WriteBoolToArray(19, this->_internal_enable_arc_file_picker_experiment(), target);
- }
-
- // bool enable_custom_tabs_experiment = 20 [deprecated = true];
- if (this->_internal_enable_custom_tabs_experiment() != 0) {
- target = stream->EnsureSpace(target);
- target = ::_pbi::WireFormatLite::WriteBoolToArray(20, this->_internal_enable_custom_tabs_experiment(), target);
- }
-
// bool enable_keyboard_shortcut_helper_integration = 21;
if (this->_internal_enable_keyboard_shortcut_helper_integration() != 0) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteBoolToArray(21, this->_internal_enable_keyboard_shortcut_helper_integration(), target);
}
- // bool enable_notifications_refresh = 22 [deprecated = true];
- if (this->_internal_enable_notifications_refresh() != 0) {
- target = stream->EnsureSpace(target);
- target = ::_pbi::WireFormatLite::WriteBoolToArray(22, this->_internal_enable_notifications_refresh(), target);
- }
-
- // bool enable_tts_caching = 23 [deprecated = true];
- if (this->_internal_enable_tts_caching() != 0) {
- target = stream->EnsureSpace(target);
- target = ::_pbi::WireFormatLite::WriteBoolToArray(23, this->_internal_enable_tts_caching(), target);
- }
-
- // bool enable_gmscore_lmk_protection = 24 [deprecated = true];
- if (this->_internal_enable_gmscore_lmk_protection() != 0) {
- target = stream->EnsureSpace(target);
- target = ::_pbi::WireFormatLite::WriteBoolToArray(24, this->_internal_enable_gmscore_lmk_protection(), target);
- }
-
// bool enable_broadcast_anr_prenotify = 25;
if (this->_internal_enable_broadcast_anr_prenotify() != 0) {
target = stream->EnsureSpace(target);
@@ -6261,24 +6045,6 @@
target = ::_pbi::WireFormatLite::WriteInt32ToArray(28, this->_internal_vm_memory_psi_period(), target);
}
- // bool disable_media_store_maintenance = 29 [deprecated = true];
- if (this->_internal_disable_media_store_maintenance() != 0) {
- target = stream->EnsureSpace(target);
- target = ::_pbi::WireFormatLite::WriteBoolToArray(29, this->_internal_disable_media_store_maintenance(), target);
- }
-
- // bool arc_generate_play_auto_install = 30 [deprecated = true];
- if (this->_internal_arc_generate_play_auto_install() != 0) {
- target = stream->EnsureSpace(target);
- target = ::_pbi::WireFormatLite::WriteBoolToArray(30, this->_internal_arc_generate_play_auto_install(), target);
- }
-
- // bool disable_download_provider = 31 [deprecated = true];
- if (this->_internal_disable_download_provider() != 0) {
- target = stream->EnsureSpace(target);
- target = ::_pbi::WireFormatLite::WriteBoolToArray(31, this->_internal_disable_download_provider(), target);
- }
-
// int32 guest_zram_size = 32;
if (this->_internal_guest_zram_size() != 0) {
target = stream->EnsureSpace(target);
@@ -6378,14 +6144,6 @@
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
}
- // repeated string params = 5 [deprecated = true];
- total_size += 1 *
- ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.params_.size());
- for (int i = 0, n = _impl_.params_.size(); i < n; i++) {
- total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
- _impl_.params_.Get(i));
- }
-
// string name = 3;
if (!this->_internal_name().empty()) {
total_size += 1 +
@@ -6456,34 +6214,19 @@
total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_rootfs_block_size());
}
- // bool use_per_vm_core_scheduling = 14;
- if (this->_internal_use_per_vm_core_scheduling() != 0) {
- total_size += 1 + 1;
- }
-
- // bool enable_consumer_auto_update_toggle = 16 [deprecated = true];
- if (this->_internal_enable_consumer_auto_update_toggle() != 0) {
- total_size += 2 + 1;
- }
-
- // bool lock_guest_memory = 18;
- if (this->_internal_lock_guest_memory() != 0) {
- total_size += 2 + 1;
- }
-
- // bool enable_arc_file_picker_experiment = 19 [deprecated = true];
- if (this->_internal_enable_arc_file_picker_experiment() != 0) {
- total_size += 2 + 1;
- }
-
// .vm_tools.concierge.StartArcVmRequest.DisplayOrientation panel_orientation = 17;
if (this->_internal_panel_orientation() != 0) {
total_size += 2 +
::_pbi::WireFormatLite::EnumSize(this->_internal_panel_orientation());
}
- // bool enable_custom_tabs_experiment = 20 [deprecated = true];
- if (this->_internal_enable_custom_tabs_experiment() != 0) {
+ // bool use_per_vm_core_scheduling = 14;
+ if (this->_internal_use_per_vm_core_scheduling() != 0) {
+ total_size += 1 + 1;
+ }
+
+ // bool lock_guest_memory = 18;
+ if (this->_internal_lock_guest_memory() != 0) {
total_size += 2 + 1;
}
@@ -6492,13 +6235,8 @@
total_size += 2 + 1;
}
- // bool enable_notifications_refresh = 22 [deprecated = true];
- if (this->_internal_enable_notifications_refresh() != 0) {
- total_size += 2 + 1;
- }
-
- // bool enable_tts_caching = 23 [deprecated = true];
- if (this->_internal_enable_tts_caching() != 0) {
+ // bool enable_broadcast_anr_prenotify = 25;
+ if (this->_internal_enable_broadcast_anr_prenotify() != 0) {
total_size += 2 + 1;
}
@@ -6509,26 +6247,6 @@
this->_internal_logd_config_size());
}
- // bool enable_gmscore_lmk_protection = 24 [deprecated = true];
- if (this->_internal_enable_gmscore_lmk_protection() != 0) {
- total_size += 2 + 1;
- }
-
- // bool enable_broadcast_anr_prenotify = 25;
- if (this->_internal_enable_broadcast_anr_prenotify() != 0) {
- total_size += 2 + 1;
- }
-
- // bool enable_virtio_blk_data = 27;
- if (this->_internal_enable_virtio_blk_data() != 0) {
- total_size += 2 + 1;
- }
-
- // bool disable_media_store_maintenance = 29 [deprecated = true];
- if (this->_internal_disable_media_store_maintenance() != 0) {
- total_size += 2 + 1;
- }
-
// int32 vm_memory_psi_period = 28;
if (this->_internal_vm_memory_psi_period() != 0) {
total_size += 2 +
@@ -6550,13 +6268,22 @@
this->_internal_guest_swappiness());
}
- // bool arc_generate_play_auto_install = 30 [deprecated = true];
- if (this->_internal_arc_generate_play_auto_install() != 0) {
- total_size += 2 + 1;
+ // int32 mglru_reclaim_interval = 35;
+ if (this->_internal_mglru_reclaim_interval() != 0) {
+ total_size += 2 +
+ ::_pbi::WireFormatLite::Int32Size(
+ this->_internal_mglru_reclaim_interval());
}
- // bool disable_download_provider = 31 [deprecated = true];
- if (this->_internal_disable_download_provider() != 0) {
+ // int32 mglru_reclaim_swappiness = 36;
+ if (this->_internal_mglru_reclaim_swappiness() != 0) {
+ total_size += 2 +
+ ::_pbi::WireFormatLite::Int32Size(
+ this->_internal_mglru_reclaim_swappiness());
+ }
+
+ // bool enable_virtio_blk_data = 27;
+ if (this->_internal_enable_virtio_blk_data() != 0) {
total_size += 2 + 1;
}
@@ -6570,18 +6297,9 @@
total_size += 2 + 1;
}
- // int32 mglru_reclaim_interval = 35;
- if (this->_internal_mglru_reclaim_interval() != 0) {
- total_size += 2 +
- ::_pbi::WireFormatLite::Int32Size(
- this->_internal_mglru_reclaim_interval());
- }
-
- // int32 mglru_reclaim_swappiness = 36;
- if (this->_internal_mglru_reclaim_swappiness() != 0) {
- total_size += 2 +
- ::_pbi::WireFormatLite::Int32Size(
- this->_internal_mglru_reclaim_swappiness());
+ // bool enable_web_view_zygote_lazy_init = 42;
+ if (this->_internal_enable_web_view_zygote_lazy_init() != 0) {
+ total_size += 2 + 1;
}
// .vm_tools.concierge.StartArcVmRequest.UsapProfileType usap_profile = 38;
@@ -6602,11 +6320,6 @@
::_pbi::WireFormatLite::EnumSize(this->_internal_ureadahead_mode());
}
- // bool enable_web_view_zygote_lazy_init = 42;
- if (this->_internal_enable_web_view_zygote_lazy_init() != 0) {
- total_size += 2 + 1;
- }
-
// bool enable_vmm_swap = 43;
if (this->_internal_enable_vmm_swap() != 0) {
total_size += 2 + 1;
@@ -6634,7 +6347,6 @@
(void) cached_has_bits;
_this->_impl_.disks_.MergeFrom(from._impl_.disks_);
- _this->_impl_.params_.MergeFrom(from._impl_.params_);
if (!from._internal_name().empty()) {
_this->_internal_set_name(from._internal_name());
}
@@ -6673,47 +6385,23 @@
if (from._internal_rootfs_block_size() != 0) {
_this->_internal_set_rootfs_block_size(from._internal_rootfs_block_size());
}
+ if (from._internal_panel_orientation() != 0) {
+ _this->_internal_set_panel_orientation(from._internal_panel_orientation());
+ }
if (from._internal_use_per_vm_core_scheduling() != 0) {
_this->_internal_set_use_per_vm_core_scheduling(from._internal_use_per_vm_core_scheduling());
}
- if (from._internal_enable_consumer_auto_update_toggle() != 0) {
- _this->_internal_set_enable_consumer_auto_update_toggle(from._internal_enable_consumer_auto_update_toggle());
- }
if (from._internal_lock_guest_memory() != 0) {
_this->_internal_set_lock_guest_memory(from._internal_lock_guest_memory());
}
- if (from._internal_enable_arc_file_picker_experiment() != 0) {
- _this->_internal_set_enable_arc_file_picker_experiment(from._internal_enable_arc_file_picker_experiment());
- }
- if (from._internal_panel_orientation() != 0) {
- _this->_internal_set_panel_orientation(from._internal_panel_orientation());
- }
- if (from._internal_enable_custom_tabs_experiment() != 0) {
- _this->_internal_set_enable_custom_tabs_experiment(from._internal_enable_custom_tabs_experiment());
- }
if (from._internal_enable_keyboard_shortcut_helper_integration() != 0) {
_this->_internal_set_enable_keyboard_shortcut_helper_integration(from._internal_enable_keyboard_shortcut_helper_integration());
}
- if (from._internal_enable_notifications_refresh() != 0) {
- _this->_internal_set_enable_notifications_refresh(from._internal_enable_notifications_refresh());
- }
- if (from._internal_enable_tts_caching() != 0) {
- _this->_internal_set_enable_tts_caching(from._internal_enable_tts_caching());
- }
- if (from._internal_logd_config_size() != 0) {
- _this->_internal_set_logd_config_size(from._internal_logd_config_size());
- }
- if (from._internal_enable_gmscore_lmk_protection() != 0) {
- _this->_internal_set_enable_gmscore_lmk_protection(from._internal_enable_gmscore_lmk_protection());
- }
if (from._internal_enable_broadcast_anr_prenotify() != 0) {
_this->_internal_set_enable_broadcast_anr_prenotify(from._internal_enable_broadcast_anr_prenotify());
}
- if (from._internal_enable_virtio_blk_data() != 0) {
- _this->_internal_set_enable_virtio_blk_data(from._internal_enable_virtio_blk_data());
- }
- if (from._internal_disable_media_store_maintenance() != 0) {
- _this->_internal_set_disable_media_store_maintenance(from._internal_disable_media_store_maintenance());
+ if (from._internal_logd_config_size() != 0) {
+ _this->_internal_set_logd_config_size(from._internal_logd_config_size());
}
if (from._internal_vm_memory_psi_period() != 0) {
_this->_internal_set_vm_memory_psi_period(from._internal_vm_memory_psi_period());
@@ -6724,11 +6412,14 @@
if (from._internal_guest_swappiness() != 0) {
_this->_internal_set_guest_swappiness(from._internal_guest_swappiness());
}
- if (from._internal_arc_generate_play_auto_install() != 0) {
- _this->_internal_set_arc_generate_play_auto_install(from._internal_arc_generate_play_auto_install());
+ if (from._internal_mglru_reclaim_interval() != 0) {
+ _this->_internal_set_mglru_reclaim_interval(from._internal_mglru_reclaim_interval());
}
- if (from._internal_disable_download_provider() != 0) {
- _this->_internal_set_disable_download_provider(from._internal_disable_download_provider());
+ if (from._internal_mglru_reclaim_swappiness() != 0) {
+ _this->_internal_set_mglru_reclaim_swappiness(from._internal_mglru_reclaim_swappiness());
+ }
+ if (from._internal_enable_virtio_blk_data() != 0) {
+ _this->_internal_set_enable_virtio_blk_data(from._internal_enable_virtio_blk_data());
}
if (from._internal_update_o4c_list_via_a2c2() != 0) {
_this->_internal_set_update_o4c_list_via_a2c2(from._internal_update_o4c_list_via_a2c2());
@@ -6736,11 +6427,8 @@
if (from._internal_enable_rw() != 0) {
_this->_internal_set_enable_rw(from._internal_enable_rw());
}
- if (from._internal_mglru_reclaim_interval() != 0) {
- _this->_internal_set_mglru_reclaim_interval(from._internal_mglru_reclaim_interval());
- }
- if (from._internal_mglru_reclaim_swappiness() != 0) {
- _this->_internal_set_mglru_reclaim_swappiness(from._internal_mglru_reclaim_swappiness());
+ if (from._internal_enable_web_view_zygote_lazy_init() != 0) {
+ _this->_internal_set_enable_web_view_zygote_lazy_init(from._internal_enable_web_view_zygote_lazy_init());
}
if (from._internal_usap_profile() != 0) {
_this->_internal_set_usap_profile(from._internal_usap_profile());
@@ -6751,9 +6439,6 @@
if (from._internal_ureadahead_mode() != 0) {
_this->_internal_set_ureadahead_mode(from._internal_ureadahead_mode());
}
- if (from._internal_enable_web_view_zygote_lazy_init() != 0) {
- _this->_internal_set_enable_web_view_zygote_lazy_init(from._internal_enable_web_view_zygote_lazy_init());
- }
if (from._internal_enable_vmm_swap() != 0) {
_this->_internal_set_enable_vmm_swap(from._internal_enable_vmm_swap());
}
@@ -6777,7 +6462,6 @@
auto* rhs_arena = other->GetArenaForAllocation();
_internal_metadata_.InternalSwap(&other->_internal_metadata_);
_impl_.disks_.InternalSwap(&other->_impl_.disks_);
- _impl_.params_.InternalSwap(&other->_impl_.params_);
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
&_impl_.name_, lhs_arena,
&other->_impl_.name_, rhs_arena
diff --git a/chroot/build/amd64-generic/tmp/portage/chromeos-base/system_api-9999/work/build/out/Default/gen/include/vm_concierge/concierge_service.pb.h b/chroot/build/amd64-generic/tmp/portage/chromeos-base/system_api-9999/work/build/out/Default/gen/include/vm_concierge/concierge_service.pb.h
index 3ac27b5..e053ac4 100644
--- a/chroot/build/amd64-generic/tmp/portage/chromeos-base/system_api-9999/work/build/out/Default/gen/include/vm_concierge/concierge_service.pb.h
+++ b/chroot/build/amd64-generic/tmp/portage/chromeos-base/system_api-9999/work/build/out/Default/gen/include/vm_concierge/concierge_service.pb.h
@@ -1825,7 +1825,6 @@
kKernelParamsFieldNumber = 17,
kFeaturesFieldNumber = 21,
kOemStringsFieldNumber = 24,
- kSharedDirectoryFieldNumber = 3,
kNameFieldNumber = 4,
kOwnerIdFieldNumber = 7,
kVmUsernameFieldNumber = 26,
@@ -1946,20 +1945,6 @@
std::string* _internal_add_oem_strings();
public:
- // string shared_directory = 3 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_shared_directory();
- PROTOBUF_DEPRECATED const std::string& shared_directory() const;
- template <typename ArgT0 = const std::string&, typename... ArgT>
- PROTOBUF_DEPRECATED void set_shared_directory(ArgT0&& arg0, ArgT... args);
- PROTOBUF_DEPRECATED std::string* mutable_shared_directory();
- PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_shared_directory();
- PROTOBUF_DEPRECATED void set_allocated_shared_directory(std::string* shared_directory);
- private:
- const std::string& _internal_shared_directory() const;
- inline PROTOBUF_ALWAYS_INLINE void _internal_set_shared_directory(const std::string& value);
- std::string* _internal_mutable_shared_directory();
- public:
-
// string name = 4;
void clear_name();
const std::string& name() const;
@@ -2170,7 +2155,6 @@
::PROTOBUF_NAMESPACE_ID::RepeatedField<int> features_;
mutable std::atomic<int> _features_cached_byte_size_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> oem_strings_;
- ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr shared_directory_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr owner_id_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr vm_username_;
@@ -2663,7 +2647,6 @@
enum : int {
kDisksFieldNumber = 2,
- kParamsFieldNumber = 5,
kNameFieldNumber = 3,
kOwnerIdFieldNumber = 4,
kFstabFieldNumber = 6,
@@ -2676,33 +2659,24 @@
kUseHugepagesFieldNumber = 11,
kMemoryMibFieldNumber = 12,
kRootfsBlockSizeFieldNumber = 15,
- kUsePerVmCoreSchedulingFieldNumber = 14,
- kEnableConsumerAutoUpdateToggleFieldNumber = 16,
- kLockGuestMemoryFieldNumber = 18,
- kEnableArcFilePickerExperimentFieldNumber = 19,
kPanelOrientationFieldNumber = 17,
- kEnableCustomTabsExperimentFieldNumber = 20,
+ kUsePerVmCoreSchedulingFieldNumber = 14,
+ kLockGuestMemoryFieldNumber = 18,
kEnableKeyboardShortcutHelperIntegrationFieldNumber = 21,
- kEnableNotificationsRefreshFieldNumber = 22,
- kEnableTtsCachingFieldNumber = 23,
- kLogdConfigSizeFieldNumber = 26,
- kEnableGmscoreLmkProtectionFieldNumber = 24,
kEnableBroadcastAnrPrenotifyFieldNumber = 25,
- kEnableVirtioBlkDataFieldNumber = 27,
- kDisableMediaStoreMaintenanceFieldNumber = 29,
+ kLogdConfigSizeFieldNumber = 26,
kVmMemoryPsiPeriodFieldNumber = 28,
kGuestZramSizeFieldNumber = 32,
kGuestSwappinessFieldNumber = 33,
- kArcGeneratePlayAutoInstallFieldNumber = 30,
- kDisableDownloadProviderFieldNumber = 31,
- kUpdateO4CListViaA2C2FieldNumber = 37,
- kEnableRwFieldNumber = 41,
kMglruReclaimIntervalFieldNumber = 35,
kMglruReclaimSwappinessFieldNumber = 36,
+ kEnableVirtioBlkDataFieldNumber = 27,
+ kUpdateO4CListViaA2C2FieldNumber = 37,
+ kEnableRwFieldNumber = 41,
+ kEnableWebViewZygoteLazyInitFieldNumber = 42,
kUsapProfileFieldNumber = 38,
kNativeBridgeExperimentFieldNumber = 39,
kUreadaheadModeFieldNumber = 40,
- kEnableWebViewZygoteLazyInitFieldNumber = 42,
kEnableVmmSwapFieldNumber = 43,
};
// repeated .vm_tools.concierge.DiskImage disks = 2;
@@ -2723,30 +2697,6 @@
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::vm_tools::concierge::DiskImage >&
disks() const;
- // repeated string params = 5 [deprecated = true];
- PROTOBUF_DEPRECATED int params_size() const;
- private:
- int _internal_params_size() const;
- public:
- PROTOBUF_DEPRECATED void clear_params();
- PROTOBUF_DEPRECATED const std::string& params(int index) const;
- PROTOBUF_DEPRECATED std::string* mutable_params(int index);
- PROTOBUF_DEPRECATED void set_params(int index, const std::string& value);
- PROTOBUF_DEPRECATED void set_params(int index, std::string&& value);
- PROTOBUF_DEPRECATED void set_params(int index, const char* value);
- PROTOBUF_DEPRECATED void set_params(int index, const char* value, size_t size);
- PROTOBUF_DEPRECATED std::string* add_params();
- PROTOBUF_DEPRECATED void add_params(const std::string& value);
- PROTOBUF_DEPRECATED void add_params(std::string&& value);
- PROTOBUF_DEPRECATED void add_params(const char* value);
- PROTOBUF_DEPRECATED void add_params(const char* value, size_t size);
- PROTOBUF_DEPRECATED const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& params() const;
- PROTOBUF_DEPRECATED ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_params();
- private:
- const std::string& _internal_params(int index) const;
- std::string* _internal_add_params();
- public:
-
// string name = 3;
void clear_name();
const std::string& name() const;
@@ -2888,6 +2838,15 @@
void _internal_set_rootfs_block_size(uint32_t value);
public:
+ // .vm_tools.concierge.StartArcVmRequest.DisplayOrientation panel_orientation = 17;
+ void clear_panel_orientation();
+ ::vm_tools::concierge::StartArcVmRequest_DisplayOrientation panel_orientation() const;
+ void set_panel_orientation(::vm_tools::concierge::StartArcVmRequest_DisplayOrientation value);
+ private:
+ ::vm_tools::concierge::StartArcVmRequest_DisplayOrientation _internal_panel_orientation() const;
+ void _internal_set_panel_orientation(::vm_tools::concierge::StartArcVmRequest_DisplayOrientation value);
+ public:
+
// bool use_per_vm_core_scheduling = 14;
void clear_use_per_vm_core_scheduling();
bool use_per_vm_core_scheduling() const;
@@ -2897,15 +2856,6 @@
void _internal_set_use_per_vm_core_scheduling(bool value);
public:
- // bool enable_consumer_auto_update_toggle = 16 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_consumer_auto_update_toggle();
- PROTOBUF_DEPRECATED bool enable_consumer_auto_update_toggle() const;
- PROTOBUF_DEPRECATED void set_enable_consumer_auto_update_toggle(bool value);
- private:
- bool _internal_enable_consumer_auto_update_toggle() const;
- void _internal_set_enable_consumer_auto_update_toggle(bool value);
- public:
-
// bool lock_guest_memory = 18;
void clear_lock_guest_memory();
bool lock_guest_memory() const;
@@ -2915,33 +2865,6 @@
void _internal_set_lock_guest_memory(bool value);
public:
- // bool enable_arc_file_picker_experiment = 19 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_arc_file_picker_experiment();
- PROTOBUF_DEPRECATED bool enable_arc_file_picker_experiment() const;
- PROTOBUF_DEPRECATED void set_enable_arc_file_picker_experiment(bool value);
- private:
- bool _internal_enable_arc_file_picker_experiment() const;
- void _internal_set_enable_arc_file_picker_experiment(bool value);
- public:
-
- // .vm_tools.concierge.StartArcVmRequest.DisplayOrientation panel_orientation = 17;
- void clear_panel_orientation();
- ::vm_tools::concierge::StartArcVmRequest_DisplayOrientation panel_orientation() const;
- void set_panel_orientation(::vm_tools::concierge::StartArcVmRequest_DisplayOrientation value);
- private:
- ::vm_tools::concierge::StartArcVmRequest_DisplayOrientation _internal_panel_orientation() const;
- void _internal_set_panel_orientation(::vm_tools::concierge::StartArcVmRequest_DisplayOrientation value);
- public:
-
- // bool enable_custom_tabs_experiment = 20 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_custom_tabs_experiment();
- PROTOBUF_DEPRECATED bool enable_custom_tabs_experiment() const;
- PROTOBUF_DEPRECATED void set_enable_custom_tabs_experiment(bool value);
- private:
- bool _internal_enable_custom_tabs_experiment() const;
- void _internal_set_enable_custom_tabs_experiment(bool value);
- public:
-
// bool enable_keyboard_shortcut_helper_integration = 21;
void clear_enable_keyboard_shortcut_helper_integration();
bool enable_keyboard_shortcut_helper_integration() const;
@@ -2951,42 +2874,6 @@
void _internal_set_enable_keyboard_shortcut_helper_integration(bool value);
public:
- // bool enable_notifications_refresh = 22 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_notifications_refresh();
- PROTOBUF_DEPRECATED bool enable_notifications_refresh() const;
- PROTOBUF_DEPRECATED void set_enable_notifications_refresh(bool value);
- private:
- bool _internal_enable_notifications_refresh() const;
- void _internal_set_enable_notifications_refresh(bool value);
- public:
-
- // bool enable_tts_caching = 23 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_tts_caching();
- PROTOBUF_DEPRECATED bool enable_tts_caching() const;
- PROTOBUF_DEPRECATED void set_enable_tts_caching(bool value);
- private:
- bool _internal_enable_tts_caching() const;
- void _internal_set_enable_tts_caching(bool value);
- public:
-
- // int32 logd_config_size = 26 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_logd_config_size();
- PROTOBUF_DEPRECATED int32_t logd_config_size() const;
- PROTOBUF_DEPRECATED void set_logd_config_size(int32_t value);
- private:
- int32_t _internal_logd_config_size() const;
- void _internal_set_logd_config_size(int32_t value);
- public:
-
- // bool enable_gmscore_lmk_protection = 24 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_gmscore_lmk_protection();
- PROTOBUF_DEPRECATED bool enable_gmscore_lmk_protection() const;
- PROTOBUF_DEPRECATED void set_enable_gmscore_lmk_protection(bool value);
- private:
- bool _internal_enable_gmscore_lmk_protection() const;
- void _internal_set_enable_gmscore_lmk_protection(bool value);
- public:
-
// bool enable_broadcast_anr_prenotify = 25;
void clear_enable_broadcast_anr_prenotify();
bool enable_broadcast_anr_prenotify() const;
@@ -2996,22 +2883,13 @@
void _internal_set_enable_broadcast_anr_prenotify(bool value);
public:
- // bool enable_virtio_blk_data = 27;
- void clear_enable_virtio_blk_data();
- bool enable_virtio_blk_data() const;
- void set_enable_virtio_blk_data(bool value);
+ // int32 logd_config_size = 26 [deprecated = true];
+ PROTOBUF_DEPRECATED void clear_logd_config_size();
+ PROTOBUF_DEPRECATED int32_t logd_config_size() const;
+ PROTOBUF_DEPRECATED void set_logd_config_size(int32_t value);
private:
- bool _internal_enable_virtio_blk_data() const;
- void _internal_set_enable_virtio_blk_data(bool value);
- public:
-
- // bool disable_media_store_maintenance = 29 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_disable_media_store_maintenance();
- PROTOBUF_DEPRECATED bool disable_media_store_maintenance() const;
- PROTOBUF_DEPRECATED void set_disable_media_store_maintenance(bool value);
- private:
- bool _internal_disable_media_store_maintenance() const;
- void _internal_set_disable_media_store_maintenance(bool value);
+ int32_t _internal_logd_config_size() const;
+ void _internal_set_logd_config_size(int32_t value);
public:
// int32 vm_memory_psi_period = 28;
@@ -3041,22 +2919,31 @@
void _internal_set_guest_swappiness(int32_t value);
public:
- // bool arc_generate_play_auto_install = 30 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_arc_generate_play_auto_install();
- PROTOBUF_DEPRECATED bool arc_generate_play_auto_install() const;
- PROTOBUF_DEPRECATED void set_arc_generate_play_auto_install(bool value);
+ // int32 mglru_reclaim_interval = 35;
+ void clear_mglru_reclaim_interval();
+ int32_t mglru_reclaim_interval() const;
+ void set_mglru_reclaim_interval(int32_t value);
private:
- bool _internal_arc_generate_play_auto_install() const;
- void _internal_set_arc_generate_play_auto_install(bool value);
+ int32_t _internal_mglru_reclaim_interval() const;
+ void _internal_set_mglru_reclaim_interval(int32_t value);
public:
- // bool disable_download_provider = 31 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_disable_download_provider();
- PROTOBUF_DEPRECATED bool disable_download_provider() const;
- PROTOBUF_DEPRECATED void set_disable_download_provider(bool value);
+ // int32 mglru_reclaim_swappiness = 36;
+ void clear_mglru_reclaim_swappiness();
+ int32_t mglru_reclaim_swappiness() const;
+ void set_mglru_reclaim_swappiness(int32_t value);
private:
- bool _internal_disable_download_provider() const;
- void _internal_set_disable_download_provider(bool value);
+ int32_t _internal_mglru_reclaim_swappiness() const;
+ void _internal_set_mglru_reclaim_swappiness(int32_t value);
+ public:
+
+ // bool enable_virtio_blk_data = 27;
+ void clear_enable_virtio_blk_data();
+ bool enable_virtio_blk_data() const;
+ void set_enable_virtio_blk_data(bool value);
+ private:
+ bool _internal_enable_virtio_blk_data() const;
+ void _internal_set_enable_virtio_blk_data(bool value);
public:
// bool update_o4c_list_via_a2c2 = 37 [deprecated = true];
@@ -3077,22 +2964,13 @@
void _internal_set_enable_rw(bool value);
public:
- // int32 mglru_reclaim_interval = 35;
- void clear_mglru_reclaim_interval();
- int32_t mglru_reclaim_interval() const;
- void set_mglru_reclaim_interval(int32_t value);
+ // bool enable_web_view_zygote_lazy_init = 42;
+ void clear_enable_web_view_zygote_lazy_init();
+ bool enable_web_view_zygote_lazy_init() const;
+ void set_enable_web_view_zygote_lazy_init(bool value);
private:
- int32_t _internal_mglru_reclaim_interval() const;
- void _internal_set_mglru_reclaim_interval(int32_t value);
- public:
-
- // int32 mglru_reclaim_swappiness = 36;
- void clear_mglru_reclaim_swappiness();
- int32_t mglru_reclaim_swappiness() const;
- void set_mglru_reclaim_swappiness(int32_t value);
- private:
- int32_t _internal_mglru_reclaim_swappiness() const;
- void _internal_set_mglru_reclaim_swappiness(int32_t value);
+ bool _internal_enable_web_view_zygote_lazy_init() const;
+ void _internal_set_enable_web_view_zygote_lazy_init(bool value);
public:
// .vm_tools.concierge.StartArcVmRequest.UsapProfileType usap_profile = 38;
@@ -3122,15 +3000,6 @@
void _internal_set_ureadahead_mode(::vm_tools::concierge::StartArcVmRequest_UreadaheadMode value);
public:
- // bool enable_web_view_zygote_lazy_init = 42;
- void clear_enable_web_view_zygote_lazy_init();
- bool enable_web_view_zygote_lazy_init() const;
- void set_enable_web_view_zygote_lazy_init(bool value);
- private:
- bool _internal_enable_web_view_zygote_lazy_init() const;
- void _internal_set_enable_web_view_zygote_lazy_init(bool value);
- public:
-
// bool enable_vmm_swap = 43;
void clear_enable_vmm_swap();
bool enable_vmm_swap() const;
@@ -3149,7 +3018,6 @@
typedef void DestructorSkippable_;
struct Impl_ {
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::vm_tools::concierge::DiskImage > disks_;
- ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> params_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr owner_id_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fstab_;
@@ -3162,33 +3030,24 @@
bool use_hugepages_;
uint32_t memory_mib_;
uint32_t rootfs_block_size_;
- bool use_per_vm_core_scheduling_;
- bool enable_consumer_auto_update_toggle_;
- bool lock_guest_memory_;
- bool enable_arc_file_picker_experiment_;
int panel_orientation_;
- bool enable_custom_tabs_experiment_;
+ bool use_per_vm_core_scheduling_;
+ bool lock_guest_memory_;
bool enable_keyboard_shortcut_helper_integration_;
- bool enable_notifications_refresh_;
- bool enable_tts_caching_;
- int32_t logd_config_size_;
- bool enable_gmscore_lmk_protection_;
bool enable_broadcast_anr_prenotify_;
- bool enable_virtio_blk_data_;
- bool disable_media_store_maintenance_;
+ int32_t logd_config_size_;
int32_t vm_memory_psi_period_;
int32_t guest_zram_size_;
int32_t guest_swappiness_;
- bool arc_generate_play_auto_install_;
- bool disable_download_provider_;
- bool update_o4c_list_via_a2c2_;
- bool enable_rw_;
int32_t mglru_reclaim_interval_;
int32_t mglru_reclaim_swappiness_;
+ bool enable_virtio_blk_data_;
+ bool update_o4c_list_via_a2c2_;
+ bool enable_rw_;
+ bool enable_web_view_zygote_lazy_init_;
int usap_profile_;
int native_bridge_experiment_;
int ureadahead_mode_;
- bool enable_web_view_zygote_lazy_init_;
bool enable_vmm_swap_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
};
@@ -15041,56 +14900,6 @@
return _impl_.disks_;
}
-// string shared_directory = 3 [deprecated = true];
-inline void StartVmRequest::clear_shared_directory() {
- _impl_.shared_directory_.ClearToEmpty();
-}
-inline const std::string& StartVmRequest::shared_directory() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartVmRequest.shared_directory)
- return _internal_shared_directory();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void StartVmRequest::set_shared_directory(ArgT0&& arg0, ArgT... args) {
-
- _impl_.shared_directory_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartVmRequest.shared_directory)
-}
-inline std::string* StartVmRequest::mutable_shared_directory() {
- std::string* _s = _internal_mutable_shared_directory();
- // @@protoc_insertion_point(field_mutable:vm_tools.concierge.StartVmRequest.shared_directory)
- return _s;
-}
-inline const std::string& StartVmRequest::_internal_shared_directory() const {
- return _impl_.shared_directory_.Get();
-}
-inline void StartVmRequest::_internal_set_shared_directory(const std::string& value) {
-
- _impl_.shared_directory_.Set(value, GetArenaForAllocation());
-}
-inline std::string* StartVmRequest::_internal_mutable_shared_directory() {
-
- return _impl_.shared_directory_.Mutable(GetArenaForAllocation());
-}
-inline std::string* StartVmRequest::release_shared_directory() {
- // @@protoc_insertion_point(field_release:vm_tools.concierge.StartVmRequest.shared_directory)
- return _impl_.shared_directory_.Release();
-}
-inline void StartVmRequest::set_allocated_shared_directory(std::string* shared_directory) {
- if (shared_directory != nullptr) {
-
- } else {
-
- }
- _impl_.shared_directory_.SetAllocated(shared_directory, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
- if (_impl_.shared_directory_.IsDefault()) {
- _impl_.shared_directory_.Set("", GetArenaForAllocation());
- }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
- // @@protoc_insertion_point(field_set_allocated:vm_tools.concierge.StartVmRequest.shared_directory)
-}
-
// string name = 4;
inline void StartVmRequest::clear_name() {
_impl_.name_.ClearToEmpty();
@@ -16390,81 +16199,6 @@
// @@protoc_insertion_point(field_set_allocated:vm_tools.concierge.StartArcVmRequest.owner_id)
}
-// repeated string params = 5 [deprecated = true];
-inline int StartArcVmRequest::_internal_params_size() const {
- return _impl_.params_.size();
-}
-inline int StartArcVmRequest::params_size() const {
- return _internal_params_size();
-}
-inline void StartArcVmRequest::clear_params() {
- _impl_.params_.Clear();
-}
-inline std::string* StartArcVmRequest::add_params() {
- std::string* _s = _internal_add_params();
- // @@protoc_insertion_point(field_add_mutable:vm_tools.concierge.StartArcVmRequest.params)
- return _s;
-}
-inline const std::string& StartArcVmRequest::_internal_params(int index) const {
- return _impl_.params_.Get(index);
-}
-inline const std::string& StartArcVmRequest::params(int index) const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.params)
- return _internal_params(index);
-}
-inline std::string* StartArcVmRequest::mutable_params(int index) {
- // @@protoc_insertion_point(field_mutable:vm_tools.concierge.StartArcVmRequest.params)
- return _impl_.params_.Mutable(index);
-}
-inline void StartArcVmRequest::set_params(int index, const std::string& value) {
- _impl_.params_.Mutable(index)->assign(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::set_params(int index, std::string&& value) {
- _impl_.params_.Mutable(index)->assign(std::move(value));
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::set_params(int index, const char* value) {
- GOOGLE_DCHECK(value != nullptr);
- _impl_.params_.Mutable(index)->assign(value);
- // @@protoc_insertion_point(field_set_char:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::set_params(int index, const char* value, size_t size) {
- _impl_.params_.Mutable(index)->assign(
- reinterpret_cast<const char*>(value), size);
- // @@protoc_insertion_point(field_set_pointer:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline std::string* StartArcVmRequest::_internal_add_params() {
- return _impl_.params_.Add();
-}
-inline void StartArcVmRequest::add_params(const std::string& value) {
- _impl_.params_.Add()->assign(value);
- // @@protoc_insertion_point(field_add:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::add_params(std::string&& value) {
- _impl_.params_.Add(std::move(value));
- // @@protoc_insertion_point(field_add:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::add_params(const char* value) {
- GOOGLE_DCHECK(value != nullptr);
- _impl_.params_.Add()->assign(value);
- // @@protoc_insertion_point(field_add_char:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::add_params(const char* value, size_t size) {
- _impl_.params_.Add()->assign(reinterpret_cast<const char*>(value), size);
- // @@protoc_insertion_point(field_add_pointer:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-StartArcVmRequest::params() const {
- // @@protoc_insertion_point(field_list:vm_tools.concierge.StartArcVmRequest.params)
- return _impl_.params_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-StartArcVmRequest::mutable_params() {
- // @@protoc_insertion_point(field_mutable_list:vm_tools.concierge.StartArcVmRequest.params)
- return &_impl_.params_;
-}
-
// string fstab = 6;
inline void StartArcVmRequest::clear_fstab() {
_impl_.fstab_.ClearToEmpty();
@@ -16675,26 +16409,6 @@
// @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.rootfs_block_size)
}
-// bool enable_consumer_auto_update_toggle = 16 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_consumer_auto_update_toggle() {
- _impl_.enable_consumer_auto_update_toggle_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_consumer_auto_update_toggle() const {
- return _impl_.enable_consumer_auto_update_toggle_;
-}
-inline bool StartArcVmRequest::enable_consumer_auto_update_toggle() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_consumer_auto_update_toggle)
- return _internal_enable_consumer_auto_update_toggle();
-}
-inline void StartArcVmRequest::_internal_set_enable_consumer_auto_update_toggle(bool value) {
-
- _impl_.enable_consumer_auto_update_toggle_ = value;
-}
-inline void StartArcVmRequest::set_enable_consumer_auto_update_toggle(bool value) {
- _internal_set_enable_consumer_auto_update_toggle(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_consumer_auto_update_toggle)
-}
-
// .vm_tools.concierge.StartArcVmRequest.DisplayOrientation panel_orientation = 17;
inline void StartArcVmRequest::clear_panel_orientation() {
_impl_.panel_orientation_ = 0;
@@ -16735,46 +16449,6 @@
// @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.lock_guest_memory)
}
-// bool enable_arc_file_picker_experiment = 19 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_arc_file_picker_experiment() {
- _impl_.enable_arc_file_picker_experiment_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_arc_file_picker_experiment() const {
- return _impl_.enable_arc_file_picker_experiment_;
-}
-inline bool StartArcVmRequest::enable_arc_file_picker_experiment() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_arc_file_picker_experiment)
- return _internal_enable_arc_file_picker_experiment();
-}
-inline void StartArcVmRequest::_internal_set_enable_arc_file_picker_experiment(bool value) {
-
- _impl_.enable_arc_file_picker_experiment_ = value;
-}
-inline void StartArcVmRequest::set_enable_arc_file_picker_experiment(bool value) {
- _internal_set_enable_arc_file_picker_experiment(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_arc_file_picker_experiment)
-}
-
-// bool enable_custom_tabs_experiment = 20 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_custom_tabs_experiment() {
- _impl_.enable_custom_tabs_experiment_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_custom_tabs_experiment() const {
- return _impl_.enable_custom_tabs_experiment_;
-}
-inline bool StartArcVmRequest::enable_custom_tabs_experiment() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_custom_tabs_experiment)
- return _internal_enable_custom_tabs_experiment();
-}
-inline void StartArcVmRequest::_internal_set_enable_custom_tabs_experiment(bool value) {
-
- _impl_.enable_custom_tabs_experiment_ = value;
-}
-inline void StartArcVmRequest::set_enable_custom_tabs_experiment(bool value) {
- _internal_set_enable_custom_tabs_experiment(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_custom_tabs_experiment)
-}
-
// bool enable_keyboard_shortcut_helper_integration = 21;
inline void StartArcVmRequest::clear_enable_keyboard_shortcut_helper_integration() {
_impl_.enable_keyboard_shortcut_helper_integration_ = false;
@@ -16795,66 +16469,6 @@
// @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_keyboard_shortcut_helper_integration)
}
-// bool enable_notifications_refresh = 22 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_notifications_refresh() {
- _impl_.enable_notifications_refresh_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_notifications_refresh() const {
- return _impl_.enable_notifications_refresh_;
-}
-inline bool StartArcVmRequest::enable_notifications_refresh() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_notifications_refresh)
- return _internal_enable_notifications_refresh();
-}
-inline void StartArcVmRequest::_internal_set_enable_notifications_refresh(bool value) {
-
- _impl_.enable_notifications_refresh_ = value;
-}
-inline void StartArcVmRequest::set_enable_notifications_refresh(bool value) {
- _internal_set_enable_notifications_refresh(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_notifications_refresh)
-}
-
-// bool enable_tts_caching = 23 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_tts_caching() {
- _impl_.enable_tts_caching_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_tts_caching() const {
- return _impl_.enable_tts_caching_;
-}
-inline bool StartArcVmRequest::enable_tts_caching() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_tts_caching)
- return _internal_enable_tts_caching();
-}
-inline void StartArcVmRequest::_internal_set_enable_tts_caching(bool value) {
-
- _impl_.enable_tts_caching_ = value;
-}
-inline void StartArcVmRequest::set_enable_tts_caching(bool value) {
- _internal_set_enable_tts_caching(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_tts_caching)
-}
-
-// bool enable_gmscore_lmk_protection = 24 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_gmscore_lmk_protection() {
- _impl_.enable_gmscore_lmk_protection_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_gmscore_lmk_protection() const {
- return _impl_.enable_gmscore_lmk_protection_;
-}
-inline bool StartArcVmRequest::enable_gmscore_lmk_protection() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_gmscore_lmk_protection)
- return _internal_enable_gmscore_lmk_protection();
-}
-inline void StartArcVmRequest::_internal_set_enable_gmscore_lmk_protection(bool value) {
-
- _impl_.enable_gmscore_lmk_protection_ = value;
-}
-inline void StartArcVmRequest::set_enable_gmscore_lmk_protection(bool value) {
- _internal_set_enable_gmscore_lmk_protection(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_gmscore_lmk_protection)
-}
-
// bool enable_broadcast_anr_prenotify = 25;
inline void StartArcVmRequest::clear_enable_broadcast_anr_prenotify() {
_impl_.enable_broadcast_anr_prenotify_ = false;
@@ -16935,66 +16549,6 @@
// @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.vm_memory_psi_period)
}
-// bool disable_media_store_maintenance = 29 [deprecated = true];
-inline void StartArcVmRequest::clear_disable_media_store_maintenance() {
- _impl_.disable_media_store_maintenance_ = false;
-}
-inline bool StartArcVmRequest::_internal_disable_media_store_maintenance() const {
- return _impl_.disable_media_store_maintenance_;
-}
-inline bool StartArcVmRequest::disable_media_store_maintenance() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.disable_media_store_maintenance)
- return _internal_disable_media_store_maintenance();
-}
-inline void StartArcVmRequest::_internal_set_disable_media_store_maintenance(bool value) {
-
- _impl_.disable_media_store_maintenance_ = value;
-}
-inline void StartArcVmRequest::set_disable_media_store_maintenance(bool value) {
- _internal_set_disable_media_store_maintenance(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.disable_media_store_maintenance)
-}
-
-// bool arc_generate_play_auto_install = 30 [deprecated = true];
-inline void StartArcVmRequest::clear_arc_generate_play_auto_install() {
- _impl_.arc_generate_play_auto_install_ = false;
-}
-inline bool StartArcVmRequest::_internal_arc_generate_play_auto_install() const {
- return _impl_.arc_generate_play_auto_install_;
-}
-inline bool StartArcVmRequest::arc_generate_play_auto_install() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.arc_generate_play_auto_install)
- return _internal_arc_generate_play_auto_install();
-}
-inline void StartArcVmRequest::_internal_set_arc_generate_play_auto_install(bool value) {
-
- _impl_.arc_generate_play_auto_install_ = value;
-}
-inline void StartArcVmRequest::set_arc_generate_play_auto_install(bool value) {
- _internal_set_arc_generate_play_auto_install(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.arc_generate_play_auto_install)
-}
-
-// bool disable_download_provider = 31 [deprecated = true];
-inline void StartArcVmRequest::clear_disable_download_provider() {
- _impl_.disable_download_provider_ = false;
-}
-inline bool StartArcVmRequest::_internal_disable_download_provider() const {
- return _impl_.disable_download_provider_;
-}
-inline bool StartArcVmRequest::disable_download_provider() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.disable_download_provider)
- return _internal_disable_download_provider();
-}
-inline void StartArcVmRequest::_internal_set_disable_download_provider(bool value) {
-
- _impl_.disable_download_provider_ = value;
-}
-inline void StartArcVmRequest::set_disable_download_provider(bool value) {
- _internal_set_disable_download_provider(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.disable_download_provider)
-}
-
// int32 guest_zram_size = 32;
inline void StartArcVmRequest::clear_guest_zram_size() {
_impl_.guest_zram_size_ = 0;
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/common/array.h b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/common/array.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/common/array.h
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/common/array.h
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/common/byte_buffer.h b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/common/byte_buffer.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/common/byte_buffer.h
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/common/byte_buffer.h
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/server/config/config_test.cc b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/server/config/config_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/server/config/config_test.cc
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/server/config/config_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/tests/metrics_stub.cc b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/tests/metrics_stub.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/tests/metrics_stub.cc
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/tests/metrics_stub.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/tests/test_util.h b/chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/tests/test_util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3058/work/adhd-0.0.7/cras/src/tests/test_util.h
rename to chroot/build/amd64-generic/tmp/portage/media-sound/adhd-0.0.7-r3060/work/adhd-0.0.7/cras/src/tests/test_util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/audio_bluetooth_hw/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/gatt/database.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/gatt/database.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/gatt/database.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/gatt/database.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/le_audio/client.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/le_audio/client.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/le_audio/client.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/le_audio/client.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/le_audio/metrics_collector_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/vc/device.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/vc/device.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/vc/device.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/vc/device.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/vc/types.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/vc/types.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/bta/vc/types.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/bta/vc/types.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/btcore/include/property.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/btcore/include/property.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/btcore/include/property.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/btcore/include/property.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/btcore/include/version.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/btcore/include/version.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/btcore/include/version.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/btcore/include/version.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/btcore/src/property.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/btcore/src/property.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/btcore/src/property.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/btcore/src/property.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/metrics.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/metrics.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/metrics.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/metrics.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/time_util.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/time_util.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/time_util.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/time_util.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/time_util.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/time_util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/time_util.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/time_util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/common/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/common/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/device/include/controller.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/device/include/controller.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/device/include/controller.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/device/include/controller.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/device/src/controller.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/device/src/controller.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/device/src/controller.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/device/src/controller.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/bits.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/bits.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/bits.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/bits.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/common.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/common.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/common.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/common.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/fastmath.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/fastmath.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/fastmath.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/embdrv/lc3/src/fastmath.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/benchmark.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/benchmark.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/benchmark.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/benchmark.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/bind.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/bind.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/bind.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/bind.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/callback.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/callback.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/callback.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/callback.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/callback_list.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/callback_list.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/callback_list.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/callback_list.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/lru_cache.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/lru_cache.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/lru_cache.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/lru_cache.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/numbers.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/numbers.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/numbers.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/numbers.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/strings.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/strings.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/common/strings.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/common/strings.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/crypto_toolbox/aes.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/bundler/main.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/bundler/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/bundler/main.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/bundler/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/filter.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/filter.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/filter.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/dumpsys/filter.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/fuzz/helpers.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/address.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/address.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/address.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/address.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/controller.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/controller_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/controller_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/controller_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/controller_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/hci/uuid.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/receiver.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/receiver.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/receiver.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/receiver.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/scheduler.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/scheduler.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/scheduler.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/scheduler.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/sender.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/sender.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/sender.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/l2cap/internal/sender.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/chromeos/metrics_allowlist.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/linux/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/linux/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/linux/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/linux/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/metrics.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/metrics.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/metrics.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/metrics.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/metrics/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/alarm.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/alarm.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/alarm.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/alarm.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/android/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/android/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/android/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/android/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/android/system_properties.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/android/system_properties.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/android/system_properties.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/android/system_properties.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/system_properties.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/system_properties.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/system_properties.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/chromeos/system_properties.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/host/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/host/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/host/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/host/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/host/system_properties.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/host/system_properties.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/host/system_properties.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/host/system_properties.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/linux/metrics.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/linux/metrics.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/linux/metrics.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/linux/metrics.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/linux/system_properties.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/linux/system_properties.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/linux/system_properties.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/linux/system_properties.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/linux_generic/thread.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/linux_generic/thread.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/linux_generic/thread.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/linux_generic/thread.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/metrics.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/metrics.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/metrics.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/metrics.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/queue.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/queue.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/queue.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/queue.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/rand.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/rand.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/rand.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/rand.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/syslog.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/syslog.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/syslog.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/syslog.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/system_properties.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/system_properties.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/system_properties.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/system_properties.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/thread.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/thread.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/thread.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/thread.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/os/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/os/utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/iterator.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/iterator.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/iterator.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/iterator.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/logging.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/logging.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/logging.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/logging.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/main.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/main.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/size.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/size.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/size.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/size.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/util.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/util.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/packet/parser/util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/rust/shim/callbacks/callbacks.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/rust/shim/callbacks/callbacks.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/rust/shim/callbacks/callbacks.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/rust/shim/callbacks/callbacks.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/security/security_manager.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/device.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/device.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/device.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/device.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/device.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/device.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/device.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/device.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/device_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/device_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/device_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/device_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/gd/storage/storage_module_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/include/array_utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/include/array_utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/include/array_utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/include/array_utils.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/include/check.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/include/check.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/include/check.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/include/check.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/include/notreached.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/include/notreached.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/include/notreached.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/include/notreached.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/linux_include/log/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/linux_include/log/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/linux_include/log/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/linux_include/log/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/config.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/config.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/config.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/config.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/config.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/config.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/config.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/config.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/controller.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/controller.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/controller.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/controller.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/controller.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/controller.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/controller.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/controller.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/helpers.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/helpers.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/helpers.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/helpers.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/stack.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/stack.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/main/shim/stack.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/main/shim/stack.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/alarm.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/alarm.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/alarm.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/alarm.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/allocator.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/allocator.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/allocator.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/allocator.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/array.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/array.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/array.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/array.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/buffer.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/buffer.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/buffer.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/buffer.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/config.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/config.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/config.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/config.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/future.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/future.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/future.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/future.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/list.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/list.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/list.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/list.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/mutex.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/mutex.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/mutex.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/mutex.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/socket.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/socket.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/socket.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/socket.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/socket_utils/sockets.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/socket_utils/sockets.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/socket_utils/sockets.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/socket_utils/sockets.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/thread.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/thread.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include/thread.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include/thread.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include_internal/osi/semaphore.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include_internal/osi/semaphore.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/include_internal/osi/semaphore.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/include_internal/osi/semaphore.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/buffer.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/buffer.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/buffer.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/buffer.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/config.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/config.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/config.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/config.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/future.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/future.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/future.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/future.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/socket.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/socket.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/socket.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/socket.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/thread.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/thread.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/src/thread.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/src/thread.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/test/config_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/test/config_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/test/config_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/test/config_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/test/future_test.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/test/future_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/osi/test/future_test.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/osi/test/future_test.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/packet/base/iterator.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/packet/base/iterator.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/packet/base/iterator.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/packet/base/iterator.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/profile/avrcp/device.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/rust/src/core/ffi/types.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/rust/src/core/ffi/types.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/rust/src/core/ffi/types.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/rust/src/core/ffi/types.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/stack/crypto_toolbox/aes.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/stack/test/a2dp/test_util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/connect/connect.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/interface.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/interface.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/interface.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/interface.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/main.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/main.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/main.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/main.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/property.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/property.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/property.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/property.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/property.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/property.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/property.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/property.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/read/name.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/util.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/util.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/util.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/util.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/util.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/util.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/headless/util.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/headless/util.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/rootcanal/service.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/rootcanal/service.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/test/rootcanal/service.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/test/rootcanal/service.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/types/bluetooth/uuid.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/vendor_libs/linux/interface/service.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/vendor_libs/linux/interface/service.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/system/vendor_libs/linux/interface/service.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/system/vendor_libs/linux/interface/service.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/desktop/test_environment.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/emulator/include/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/emulator/include/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/emulator/include/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/emulator/include/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/crypto/crypto.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/crypto/crypto.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/crypto/crypto.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/crypto/crypto.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/hci/address.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/hci/address.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/hci/address.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/hci/address.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/os/log.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/os/log.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/os/log.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/os/log.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/pcap.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/pcap.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/pcap.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/include/pcap.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/lib/crypto/crypto.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/lib/crypto/crypto.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/lib/crypto/crypto.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/lib/crypto/crypto.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/model/devices/device.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/test/controller/le/test_helpers.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/test/controller/le/test_helpers.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/bt/tools/rootcanal/test/controller/le/test_helpers.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/bt/tools/rootcanal/test/controller/le/test_helpers.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/common-mk/example/component/component.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/common-mk/example/component/component.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/common-mk/example/component/component.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/common-mk/example/component/component.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/common-mk/example/include/component/component.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/common-mk/example/include/component/component.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/common-mk/example/include/component/component.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/common-mk/example/include/component/component.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/common-mk/testrunner.cc b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/common-mk/testrunner.cc
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/common-mk/testrunner.cc
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/common-mk/testrunner.cc
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/common-mk/testrunner.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/common-mk/testrunner.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/common-mk/testrunner.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/common-mk/testrunner.h
diff --git a/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/external/proto_logging/stats/stats_log_api_gen/utils.h b/chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/external/proto_logging/stats/stats_log_api_gen/utils.h
similarity index 100%
rename from chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3706/work/floss-0.0.2/platform2/external/proto_logging/stats/stats_log_api_gen/utils.h
rename to chroot/build/amd64-generic/tmp/portage/net-wireless/floss-0.0.2-r3712/work/floss-0.0.2/platform2/external/proto_logging/stats/stats_log_api_gen/utils.h
diff --git a/chroot/build/amd64-generic/usr/include/chromeos/dbus/shill/dbus-constants.h b/chroot/build/amd64-generic/usr/include/chromeos/dbus/shill/dbus-constants.h
index 8e3773e..7421238 100644
--- a/chroot/build/amd64-generic/usr/include/chromeos/dbus/shill/dbus-constants.h
+++ b/chroot/build/amd64-generic/usr/include/chromeos/dbus/shill/dbus-constants.h
@@ -8,851 +8,876 @@
// TODO(benchan): Reorganize shill constants and remove deprecated ones.
namespace shill {
// Flimflam D-Bus service identifiers.
-const char kFlimflamManagerInterface[] = "org.chromium.flimflam.Manager";
-const char kFlimflamServiceName[] = "org.chromium.flimflam";
-const char kFlimflamServicePath[] = "/"; // crosbug.com/20135
-const char kFlimflamServiceInterface[] = "org.chromium.flimflam.Service";
-const char kFlimflamIPConfigInterface[] = "org.chromium.flimflam.IPConfig";
-const char kFlimflamDeviceInterface[] = "org.chromium.flimflam.Device";
-const char kFlimflamProfileInterface[] = "org.chromium.flimflam.Profile";
-const char kFlimflamThirdPartyVpnInterface[] =
+constexpr char kFlimflamManagerInterface[] = "org.chromium.flimflam.Manager";
+constexpr char kFlimflamServiceName[] = "org.chromium.flimflam";
+constexpr char kFlimflamServicePath[] = "/"; // crosbug.com/20135
+constexpr char kFlimflamServiceInterface[] = "org.chromium.flimflam.Service";
+constexpr char kFlimflamIPConfigInterface[] = "org.chromium.flimflam.IPConfig";
+constexpr char kFlimflamDeviceInterface[] = "org.chromium.flimflam.Device";
+constexpr char kFlimflamProfileInterface[] = "org.chromium.flimflam.Profile";
+constexpr char kFlimflamThirdPartyVpnInterface[] =
"org.chromium.flimflam.ThirdPartyVpn";
// Common function names.
-const char kGetPropertiesFunction[] = "GetProperties";
-const char kSetPropertyFunction[] = "SetProperty";
-const char kClearPropertyFunction[] = "ClearProperty";
+constexpr char kGetPropertiesFunction[] = "GetProperties";
+constexpr char kSetPropertyFunction[] = "SetProperty";
+constexpr char kClearPropertyFunction[] = "ClearProperty";
// Manager function names.
-const char kConfigureServiceFunction[] = "ConfigureService";
-const char kConfigureServiceForProfileFunction[] = "ConfigureServiceForProfile";
-const char kScanAndConnectToBestServicesFunction[] =
+constexpr char kConfigureServiceFunction[] = "ConfigureService";
+constexpr char kConfigureServiceForProfileFunction[] =
+ "ConfigureServiceForProfile";
+constexpr char kScanAndConnectToBestServicesFunction[] =
"ScanAndConnectToBestServices";
-const char kCreateConnectivityReportFunction[] = "CreateConnectivityReport";
-const char kDisableTechnologyFunction[] = "DisableTechnology";
-const char kEnableTechnologyFunction[] = "EnableTechnology";
-const char kFindMatchingServiceFunction[] = "FindMatchingService";
-const char kGetNetworksForGeolocation[] = "GetNetworksForGeolocation";
-const char kGetServiceFunction[] = "GetService";
-const char kSetLOHSEnabledFunction[] = "SetLOHSEnabled";
-const char kRequestScanFunction[] = "RequestScan";
-const char kRequestWiFiRestartFunction[] = "RequestWiFiRestart";
-const char kSetNetworkThrottlingFunction[] = "SetNetworkThrottlingStatus";
-const char kSetDNSProxyDOHProvidersFunction[] = "SetDNSProxyDOHProviders";
-const char kAddPasspointCredentialsFunction[] = "AddPasspointCredentials";
-const char kRemovePasspointCredentialsFunction[] = "RemovePasspointCredentials";
-const char kSetTetheringEnabledFunction[] = "SetTetheringEnabled";
-const char kCheckTetheringReadinessFunction[] = "CheckTetheringReadiness";
+constexpr char kCreateConnectivityReportFunction[] = "CreateConnectivityReport";
+constexpr char kDisableTechnologyFunction[] = "DisableTechnology";
+constexpr char kEnableTechnologyFunction[] = "EnableTechnology";
+constexpr char kFindMatchingServiceFunction[] = "FindMatchingService";
+constexpr char kGetNetworksForGeolocation[] = "GetNetworksForGeolocation";
+constexpr char kGetServiceFunction[] = "GetService";
+constexpr char kSetLOHSEnabledFunction[] = "SetLOHSEnabled";
+constexpr char kRequestScanFunction[] = "RequestScan";
+constexpr char kRequestWiFiRestartFunction[] = "RequestWiFiRestart";
+constexpr char kSetNetworkThrottlingFunction[] = "SetNetworkThrottlingStatus";
+constexpr char kSetDNSProxyDOHProvidersFunction[] = "SetDNSProxyDOHProviders";
+constexpr char kAddPasspointCredentialsFunction[] = "AddPasspointCredentials";
+constexpr char kRemovePasspointCredentialsFunction[] =
+ "RemovePasspointCredentials";
+constexpr char kSetTetheringEnabledFunction[] = "SetTetheringEnabled";
+constexpr char kCheckTetheringReadinessFunction[] = "CheckTetheringReadiness";
// Service function names.
-const char kClearPropertiesFunction[] = "ClearProperties";
-const char kCompleteCellularActivationFunction[] = "CompleteCellularActivation";
-const char kConnectFunction[] = "Connect";
-const char kDisconnectFunction[] = "Disconnect";
-const char kGetLoadableProfileEntriesFunction[] = "GetLoadableProfileEntries";
-const char kGetWiFiPassphraseFunction[] = "GetWiFiPassphrase";
-const char kGetEapPassphraseFunction[] = "GetEapPassphrase";
-const char kRemoveServiceFunction[] = "Remove";
-const char kRequestPortalDetectionFunction[] = "RequestPortalDetection";
-const char kRequestTrafficCountersFunction[] = "RequestTrafficCounters";
-const char kResetTrafficCountersFunction[] = "ResetTrafficCounters";
-const char kSetPropertiesFunction[] = "SetProperties";
+constexpr char kClearPropertiesFunction[] = "ClearProperties";
+constexpr char kCompleteCellularActivationFunction[] =
+ "CompleteCellularActivation";
+constexpr char kConnectFunction[] = "Connect";
+constexpr char kDisconnectFunction[] = "Disconnect";
+constexpr char kGetLoadableProfileEntriesFunction[] =
+ "GetLoadableProfileEntries";
+constexpr char kGetWiFiPassphraseFunction[] = "GetWiFiPassphrase";
+constexpr char kGetEapPassphraseFunction[] = "GetEapPassphrase";
+constexpr char kRemoveServiceFunction[] = "Remove";
+constexpr char kRequestPortalDetectionFunction[] = "RequestPortalDetection";
+constexpr char kRequestTrafficCountersFunction[] = "RequestTrafficCounters";
+constexpr char kResetTrafficCountersFunction[] = "ResetTrafficCounters";
+constexpr char kSetPropertiesFunction[] = "SetProperties";
// IPConfig function names.
-const char kRemoveConfigFunction[] = "Remove";
+constexpr char kRemoveConfigFunction[] = "Remove";
// Device function names.
-const char kChangePinFunction[] = "ChangePin";
-const char kEnterPinFunction[] = "EnterPin";
-const char kRegisterFunction[] = "Register";
-const char kRequirePinFunction[] = "RequirePin";
-const char kResetFunction[] = "Reset";
-const char kSetUsbEthernetMacAddressSourceFunction[] =
+constexpr char kChangePinFunction[] = "ChangePin";
+constexpr char kEnterPinFunction[] = "EnterPin";
+constexpr char kRegisterFunction[] = "Register";
+constexpr char kRequirePinFunction[] = "RequirePin";
+constexpr char kResetFunction[] = "Reset";
+constexpr char kSetUsbEthernetMacAddressSourceFunction[] =
"SetUsbEthernetMacAddressSource";
-const char kUnblockPinFunction[] = "UnblockPin";
+constexpr char kUnblockPinFunction[] = "UnblockPin";
// Profile function names.
-const char kDeleteEntryFunction[] = "DeleteEntry";
-const char kGetEntryFunction[] = "GetEntry";
+constexpr char kDeleteEntryFunction[] = "DeleteEntry";
+constexpr char kGetEntryFunction[] = "GetEntry";
// ThirdPartyVpn function names.
-const char kOnPacketReceivedFunction[] = "OnPacketReceived";
-const char kOnPlatformMessageFunction[] = "OnPlatformMessage";
-const char kSetParametersFunction[] = "SetParameters";
-const char kSendPacketFunction[] = "SendPacket";
-const char kUpdateConnectionStateFunction[] = "UpdateConnectionState";
+constexpr char kOnPacketReceivedFunction[] = "OnPacketReceived";
+constexpr char kOnPlatformMessageFunction[] = "OnPlatformMessage";
+constexpr char kSetParametersFunction[] = "SetParameters";
+constexpr char kSendPacketFunction[] = "SendPacket";
+constexpr char kUpdateConnectionStateFunction[] = "UpdateConnectionState";
// Manager property names.
-const char kActiveProfileProperty[] = "ActiveProfile";
-const char kAlwaysOnVpnPackageProperty[] = "AlwaysOnVpnPackage";
-const char kAvailableTechnologiesProperty[] = "AvailableTechnologies";
-const char kClaimedDevicesProperty[] = "ClaimedDevices";
-const char kConnectedTechnologiesProperty[] = "ConnectedTechnologies";
-const char kConnectionStateProperty[] = "ConnectionState";
-const char kDefaultServiceProperty[] = "DefaultService";
-const char kDefaultTechnologyProperty[] = "DefaultTechnology";
-const char kDevicesProperty[] = "Devices";
-const char kDhcpPropertyHostnameProperty[] = "DHCPProperty.Hostname";
-const char kDisableWiFiVHTProperty[] = "DisableWiFiVHT";
-const char kDNSProxyDOHProvidersProperty[] = "DNSProxyDOHProviders";
-const char kEnabledTechnologiesProperty[] = "EnabledTechnologies";
-const char kEnableRFC8925Property[] = "EnableRFC8925";
-const char kLOHSConfigProperty[] = "LOHSConfig";
-const char kPortalFallbackHttpUrlsProperty[] = "PortalFallbackHttpUrls";
-const char kPortalFallbackHttpsUrlsProperty[] = "PortalFallbackHttpsUrls";
-const char kPortalHttpUrlProperty[] = "PortalHttpUrl";
-const char kPortalHttpsUrlProperty[] = "PortalHttpsUrl";
-const char kProfilesProperty[] = "Profiles";
-const char kServiceCompleteListProperty[] = "ServiceCompleteList";
-const char kServiceWatchListProperty[] = "ServiceWatchList";
-const char kServicesProperty[] = "Services"; // Also used for Profile.
-const char kSupportedVPNTypesProperty[] = "SupportedVPNTypes";
-const char kTetheringAllowedProperty[] = "TetheringAllowed";
-const char kTetheringCapabilitiesProperty[] = "TetheringCapabilities";
-const char kTetheringConfigProperty[] = "TetheringConfig";
-const char kTetheringStatusProperty[] = "TetheringStatus";
-const char kUninitializedTechnologiesProperty[] = "UninitializedTechnologies";
-const char kWakeOnLanEnabledProperty[] = "WakeOnLanEnabled";
-const char kWifiGlobalFTEnabledProperty[] = "WiFi.GlobalFTEnabled";
-const char kWifiScanAllowRoamProperty[] = "WiFi.ScanAllowRoam";
+constexpr char kActiveProfileProperty[] = "ActiveProfile";
+constexpr char kAlwaysOnVpnPackageProperty[] = "AlwaysOnVpnPackage";
+constexpr char kAvailableTechnologiesProperty[] = "AvailableTechnologies";
+constexpr char kClaimedDevicesProperty[] = "ClaimedDevices";
+constexpr char kConnectedTechnologiesProperty[] = "ConnectedTechnologies";
+constexpr char kConnectionStateProperty[] = "ConnectionState";
+constexpr char kDefaultServiceProperty[] = "DefaultService";
+constexpr char kDefaultTechnologyProperty[] = "DefaultTechnology";
+constexpr char kDevicesProperty[] = "Devices";
+constexpr char kDhcpPropertyHostnameProperty[] = "DHCPProperty.Hostname";
+constexpr char kDisableWiFiVHTProperty[] = "DisableWiFiVHT";
+constexpr char kDNSProxyDOHProvidersProperty[] = "DNSProxyDOHProviders";
+constexpr char kEnabledTechnologiesProperty[] = "EnabledTechnologies";
+constexpr char kEnableRFC8925Property[] = "EnableRFC8925";
+constexpr char kLOHSConfigProperty[] = "LOHSConfig";
+constexpr char kPortalFallbackHttpUrlsProperty[] = "PortalFallbackHttpUrls";
+constexpr char kPortalFallbackHttpsUrlsProperty[] = "PortalFallbackHttpsUrls";
+constexpr char kPortalHttpUrlProperty[] = "PortalHttpUrl";
+constexpr char kPortalHttpsUrlProperty[] = "PortalHttpsUrl";
+constexpr char kProfilesProperty[] = "Profiles";
+constexpr char kServiceCompleteListProperty[] = "ServiceCompleteList";
+constexpr char kServiceWatchListProperty[] = "ServiceWatchList";
+constexpr char kServicesProperty[] = "Services"; // Also used for Profile.
+constexpr char kSupportedVPNTypesProperty[] = "SupportedVPNTypes";
+constexpr char kTetheringAllowedProperty[] = "TetheringAllowed";
+constexpr char kTetheringCapabilitiesProperty[] = "TetheringCapabilities";
+constexpr char kTetheringConfigProperty[] = "TetheringConfig";
+constexpr char kTetheringStatusProperty[] = "TetheringStatus";
+constexpr char kUninitializedTechnologiesProperty[] =
+ "UninitializedTechnologies";
+constexpr char kWakeOnLanEnabledProperty[] = "WakeOnLanEnabled";
+constexpr char kWifiGlobalFTEnabledProperty[] = "WiFi.GlobalFTEnabled";
+constexpr char kWifiScanAllowRoamProperty[] = "WiFi.ScanAllowRoam";
// Manager and DefaultProfile property names (the Manager properties that are
// persisted by a DefaultProfile; these are always read-only for
// DefaultProfile).
-const char kArpGatewayProperty[] = "ArpGateway";
-const char kCheckPortalListProperty[] = "CheckPortalList";
-const char kIgnoredDNSSearchPathsProperty[] = "IgnoredDNSSearchPaths";
-const char kNoAutoConnectTechnologiesProperty[] = "NoAutoConnectTechnologies";
-const char kProhibitedTechnologiesProperty[] = "ProhibitedTechnologies";
+constexpr char kArpGatewayProperty[] = "ArpGateway";
+constexpr char kCheckPortalListProperty[] = "CheckPortalList";
+constexpr char kIgnoredDNSSearchPathsProperty[] = "IgnoredDNSSearchPaths";
+constexpr char kNoAutoConnectTechnologiesProperty[] =
+ "NoAutoConnectTechnologies";
+constexpr char kProhibitedTechnologiesProperty[] = "ProhibitedTechnologies";
// Base Service property names.
-const char kAutoConnectProperty[] = "AutoConnect";
-const char kCheckPortalProperty[] = "CheckPortal";
-const char kConnectableProperty[] = "Connectable";
-const char kDeviceProperty[] = "Device";
-const char kDiagnosticsDisconnectsProperty[] = "Diagnostics.Disconnects";
-const char kDiagnosticsMisconnectsProperty[] = "Diagnostics.Misconnects";
-const char kDnsAutoFallbackProperty[] = "DNSAutoFallback";
-const char kEapRemoteCertificationProperty[] = "EAP.RemoteCertification";
-const char kErrorDetailsProperty[] = "ErrorDetails";
-const char kErrorProperty[] = "Error";
-const char kGuidProperty[] = "GUID";
-const char kIPConfigProperty[] = "IPConfig";
-const char kIsConnectedProperty[] = "IsConnected";
-const char kLinkMonitorDisableProperty[] = "LinkMonitorDisable";
-const char kManagedCredentialsProperty[] = "ManagedCredentials";
-const char kMeteredProperty[] = "Metered";
-const char kNameProperty[] = "Name"; // Also used for Device and Profile.
-const char kPassphraseRequiredProperty[] = "PassphraseRequired";
-const char kPortalDetectionFailedPhaseProperty[] = "PortalDetectionFailedPhase";
-const char kPortalDetectionFailedStatusProperty[] =
+constexpr char kAutoConnectProperty[] = "AutoConnect";
+constexpr char kCheckPortalProperty[] = "CheckPortal";
+constexpr char kConnectableProperty[] = "Connectable";
+constexpr char kDeviceProperty[] = "Device";
+constexpr char kDiagnosticsDisconnectsProperty[] = "Diagnostics.Disconnects";
+constexpr char kDiagnosticsMisconnectsProperty[] = "Diagnostics.Misconnects";
+constexpr char kDnsAutoFallbackProperty[] = "DNSAutoFallback";
+constexpr char kEapRemoteCertificationProperty[] = "EAP.RemoteCertification";
+constexpr char kErrorDetailsProperty[] = "ErrorDetails";
+constexpr char kErrorProperty[] = "Error";
+constexpr char kGuidProperty[] = "GUID";
+constexpr char kIPConfigProperty[] = "IPConfig";
+constexpr char kIsConnectedProperty[] = "IsConnected";
+constexpr char kLinkMonitorDisableProperty[] = "LinkMonitorDisable";
+constexpr char kManagedCredentialsProperty[] = "ManagedCredentials";
+constexpr char kMeteredProperty[] = "Metered";
+constexpr char kNameProperty[] = "Name"; // Also used for Device and Profile.
+constexpr char kPassphraseRequiredProperty[] = "PassphraseRequired";
+constexpr char kPortalDetectionFailedPhaseProperty[] =
+ "PortalDetectionFailedPhase";
+constexpr char kPortalDetectionFailedStatusProperty[] =
"PortalDetectionFailedStatus";
-const char kPortalDetectionFailedStatusCodeProperty[] =
+constexpr char kPortalDetectionFailedStatusCodeProperty[] =
"PortalDetectionFailedStatusCode";
-const char kPreviousErrorProperty[] = "PreviousError";
-const char kPreviousErrorSerialNumberProperty[] = "PreviousErrorSerialNumber";
-const char kPriorityProperty[] = "Priority";
-const char kProbeUrlProperty[] = "ProbeUrl";
-const char kProfileProperty[] = "Profile";
-const char kProxyConfigProperty[] = "ProxyConfig";
-const char kSaveCredentialsProperty[] = "SaveCredentials";
-const char kSavedIPConfigProperty[] = "SavedIPConfig";
-const char kSignalStrengthProperty[] = "Strength";
-const char kStateProperty[] = "State";
-const char kStaticIPConfigProperty[] = "StaticIPConfig";
-const char kTrafficCounterResetTimeProperty[] = "TrafficCounterResetTime";
-const char kTypeProperty[] = "Type";
-const char kUIDataProperty[] = "UIData";
-const char kVisibleProperty[] = "Visible";
-const char kONCSourceProperty[] = "ONCSource";
-const char kUplinkSpeedPropertyKbps[] = "UplinkSpeedKbps";
-const char kDownlinkSpeedPropertyKbps[] = "DownlinkSpeedKbps";
+constexpr char kPreviousErrorProperty[] = "PreviousError";
+constexpr char kPreviousErrorSerialNumberProperty[] =
+ "PreviousErrorSerialNumber";
+constexpr char kPriorityProperty[] = "Priority";
+constexpr char kProbeUrlProperty[] = "ProbeUrl";
+constexpr char kProfileProperty[] = "Profile";
+constexpr char kProxyConfigProperty[] = "ProxyConfig";
+constexpr char kSaveCredentialsProperty[] = "SaveCredentials";
+constexpr char kSavedIPConfigProperty[] = "SavedIPConfig";
+constexpr char kSignalStrengthProperty[] = "Strength";
+constexpr char kStateProperty[] = "State";
+constexpr char kStaticIPConfigProperty[] = "StaticIPConfig";
+constexpr char kTrafficCounterResetTimeProperty[] = "TrafficCounterResetTime";
+constexpr char kTypeProperty[] = "Type";
+constexpr char kUIDataProperty[] = "UIData";
+constexpr char kVisibleProperty[] = "Visible";
+constexpr char kONCSourceProperty[] = "ONCSource";
+constexpr char kUplinkSpeedPropertyKbps[] = "UplinkSpeedKbps";
+constexpr char kDownlinkSpeedPropertyKbps[] = "DownlinkSpeedKbps";
// Cellular Service property names.
-const char kActivationStateProperty[] = "Cellular.ActivationState";
-const char kActivationTypeProperty[] = "Cellular.ActivationType";
-const char kCellularAllowRoamingProperty[] = "Cellular.AllowRoaming";
-const char kCellularApnProperty[] = "Cellular.APN";
-const char kCellularLastConnectedDefaultApnProperty[] =
+constexpr char kActivationStateProperty[] = "Cellular.ActivationState";
+constexpr char kActivationTypeProperty[] = "Cellular.ActivationType";
+constexpr char kCellularAllowRoamingProperty[] = "Cellular.AllowRoaming";
+constexpr char kCellularApnProperty[] = "Cellular.APN";
+constexpr char kCellularLastConnectedDefaultApnProperty[] =
"Cellular.LastConnectedDefaultApnProperty";
-const char kCellularLastConnectedAttachApnProperty[] =
+constexpr char kCellularLastConnectedAttachApnProperty[] =
"Cellular.LastConnectedAttachApnProperty";
-const char kCellularLastGoodApnProperty[] = "Cellular.LastGoodAPN";
-const char kCellularLastAttachApnProperty[] = "Cellular.LastAttachAPN";
-const char kCellularPPPPasswordProperty[] = "Cellular.PPP.Password";
-const char kCellularPPPUsernameProperty[] = "Cellular.PPP.Username";
+constexpr char kCellularLastGoodApnProperty[] = "Cellular.LastGoodAPN";
+constexpr char kCellularLastAttachApnProperty[] = "Cellular.LastAttachAPN";
+constexpr char kCellularPPPPasswordProperty[] = "Cellular.PPP.Password";
+constexpr char kCellularPPPUsernameProperty[] = "Cellular.PPP.Username";
// TODO(b/271332404): Remove kCellularUserApnListProperty when is no longer used
// in Chrome.
-const char kCellularUserApnListProperty[] = "Cellular.UserAPNList";
-const char kCellularCustomApnListProperty[] = "Cellular.CustomAPNList";
-const char kNetworkTechnologyProperty[] = "Cellular.NetworkTechnology";
-const char kOutOfCreditsProperty[] = "Cellular.OutOfCredits";
-const char kPaymentPortalProperty[] = "Cellular.Olp";
-const char kRoamingStateProperty[] = "Cellular.RoamingState";
-const char kServingOperatorProperty[] = "Cellular.ServingOperator";
-const char kTechnologyFamilyProperty[] = "Cellular.Family";
-const char kUsageURLProperty[] = "Cellular.UsageUrl";
+constexpr char kCellularUserApnListProperty[] = "Cellular.UserAPNList";
+constexpr char kCellularCustomApnListProperty[] = "Cellular.CustomAPNList";
+constexpr char kNetworkTechnologyProperty[] = "Cellular.NetworkTechnology";
+constexpr char kOutOfCreditsProperty[] = "Cellular.OutOfCredits";
+constexpr char kPaymentPortalProperty[] = "Cellular.Olp";
+constexpr char kRoamingStateProperty[] = "Cellular.RoamingState";
+constexpr char kServingOperatorProperty[] = "Cellular.ServingOperator";
+constexpr char kTechnologyFamilyProperty[] = "Cellular.Family";
+constexpr char kUsageURLProperty[] = "Cellular.UsageUrl";
// EAP Service/Passpoint credentials property names.
-const char kEapAnonymousIdentityProperty[] = "EAP.AnonymousIdentity";
-const char kEapCaCertIdProperty[] = "EAP.CACertID";
-const char kEapCaCertPemProperty[] = "EAP.CACertPEM";
-const char kEapCaCertProperty[] = "EAP.CACert";
-const char kEapCertIdProperty[] = "EAP.CertID";
-const char kEapDomainSuffixMatchProperty[] = "EAP.DomainSuffixMatch";
-const char kEapIdentityProperty[] = "EAP.Identity";
-const char kEapKeyIdProperty[] = "EAP.KeyID";
-const char kEapKeyMgmtProperty[] = "EAP.KeyMgmt";
-const char kEapMethodProperty[] = "EAP.EAP";
-const char kEapPasswordProperty[] = "EAP.Password";
-const char kEapPhase2AuthProperty[] = "EAP.InnerEAP";
-const char kEapPinProperty[] = "EAP.PIN";
-const char kEapSubjectAlternativeNameMatchProperty[] =
+constexpr char kEapAnonymousIdentityProperty[] = "EAP.AnonymousIdentity";
+constexpr char kEapCaCertIdProperty[] = "EAP.CACertID";
+constexpr char kEapCaCertPemProperty[] = "EAP.CACertPEM";
+constexpr char kEapCaCertProperty[] = "EAP.CACert";
+constexpr char kEapCertIdProperty[] = "EAP.CertID";
+constexpr char kEapDomainSuffixMatchProperty[] = "EAP.DomainSuffixMatch";
+constexpr char kEapIdentityProperty[] = "EAP.Identity";
+constexpr char kEapKeyIdProperty[] = "EAP.KeyID";
+constexpr char kEapKeyMgmtProperty[] = "EAP.KeyMgmt";
+constexpr char kEapMethodProperty[] = "EAP.EAP";
+constexpr char kEapPasswordProperty[] = "EAP.Password";
+constexpr char kEapPhase2AuthProperty[] = "EAP.InnerEAP";
+constexpr char kEapPinProperty[] = "EAP.PIN";
+constexpr char kEapSubjectAlternativeNameMatchProperty[] =
"EAP.SubjectAlternativeNameMatch";
-const char kEapSubjectMatchProperty[] = "EAP.SubjectMatch";
-const char kEapTLSVersionMaxProperty[] = "EAP.TLSVersionMax";
-const char kEapUseLoginPasswordProperty[] = "EAP.UseLoginPassword";
-const char kEapUseProactiveKeyCachingProperty[] = "EAP.UseProactiveKeyCaching";
-const char kEapUseSystemCasProperty[] = "EAP.UseSystemCAs";
-const char kEapSubjectAlternativeNameMatchTypeProperty[] = "Type";
-const char kEapSubjectAlternativeNameMatchValueProperty[] = "Value";
-const char kPasspointFQDNProperty[] = "Passpoint.FQDN";
-const char kPasspointProvisioningSourceProperty[] =
+constexpr char kEapSubjectMatchProperty[] = "EAP.SubjectMatch";
+constexpr char kEapTLSVersionMaxProperty[] = "EAP.TLSVersionMax";
+constexpr char kEapUseLoginPasswordProperty[] = "EAP.UseLoginPassword";
+constexpr char kEapUseProactiveKeyCachingProperty[] =
+ "EAP.UseProactiveKeyCaching";
+constexpr char kEapUseSystemCasProperty[] = "EAP.UseSystemCAs";
+constexpr char kEapSubjectAlternativeNameMatchTypeProperty[] = "Type";
+constexpr char kEapSubjectAlternativeNameMatchValueProperty[] = "Value";
+constexpr char kPasspointFQDNProperty[] = "Passpoint.FQDN";
+constexpr char kPasspointProvisioningSourceProperty[] =
"Passpoint.ProvisioningSource";
-const char kPasspointMatchTypeProperty[] = "Passpoint.MatchType";
-const char kPasspointIDProperty[] = "Passpoint.ID";
+constexpr char kPasspointMatchTypeProperty[] = "Passpoint.MatchType";
+constexpr char kPasspointIDProperty[] = "Passpoint.ID";
// WiFi Service property names.
-const char kCountryProperty[] = "Country";
-const char kModeProperty[] = "Mode";
-const char kPassphraseProperty[] = "Passphrase";
-const char kSecurityClassProperty[] = "SecurityClass";
-const char kSecurityProperty[] = "Security";
-const char kSSIDProperty[] = "SSID";
-const char kWifiBSsid[] = "WiFi.BSSID";
-const char kWifiFrequencyListProperty[] = "WiFi.FrequencyList";
-const char kWifiFrequency[] = "WiFi.Frequency";
-const char kWifiHexSsid[] = "WiFi.HexSSID";
-const char kWifiHiddenSsid[] = "WiFi.HiddenSSID";
-const char kWifiPhyMode[] = "WiFi.PhyMode";
+constexpr char kCountryProperty[] = "Country";
+constexpr char kModeProperty[] = "Mode";
+constexpr char kPassphraseProperty[] = "Passphrase";
+constexpr char kSecurityClassProperty[] = "SecurityClass";
+constexpr char kSecurityProperty[] = "Security";
+constexpr char kSSIDProperty[] = "SSID";
+constexpr char kWifiBSsid[] = "WiFi.BSSID";
+constexpr char kWifiFrequencyListProperty[] = "WiFi.FrequencyList";
+constexpr char kWifiFrequency[] = "WiFi.Frequency";
+constexpr char kWifiHexSsid[] = "WiFi.HexSSID";
+constexpr char kWifiHiddenSsid[] = "WiFi.HiddenSSID";
+constexpr char kWifiPhyMode[] = "WiFi.PhyMode";
static constexpr char kWifiRandomMACPolicy[] = "WiFi.RandomMACPolicy";
-const char kWifiRekeyInProgressProperty[] = "WiFi.RekeyInProgress";
-const char kWifiRoamStateProperty[] = "WiFi.RoamState";
-const char kWifiVendorInformationProperty[] = "WiFi.VendorInformation";
-const char kWifiSignalStrengthRssiProperty[] = "WiFi.SignalStrengthRssi";
-const char kWifiBSSIDAllowlist[] = "WiFi.BSSIDAllowlist";
+constexpr char kWifiRekeyInProgressProperty[] = "WiFi.RekeyInProgress";
+constexpr char kWifiRoamStateProperty[] = "WiFi.RoamState";
+constexpr char kWifiVendorInformationProperty[] = "WiFi.VendorInformation";
+constexpr char kWifiSignalStrengthRssiProperty[] = "WiFi.SignalStrengthRssi";
+constexpr char kWifiBSSIDAllowlist[] = "WiFi.BSSIDAllowlist";
// Base VPN Service property names.
-const char kHostProperty[] = "Host";
-const char kPhysicalTechnologyProperty[] = "PhysicalTechnology";
-const char kProviderProperty[] = "Provider";
-const char kProviderHostProperty[] = "Provider.Host";
-const char kProviderTypeProperty[] = "Provider.Type";
+constexpr char kHostProperty[] = "Host";
+constexpr char kPhysicalTechnologyProperty[] = "PhysicalTechnology";
+constexpr char kProviderProperty[] = "Provider";
+constexpr char kProviderHostProperty[] = "Provider.Host";
+constexpr char kProviderTypeProperty[] = "Provider.Type";
// ArcVpn Service property names.
-const char kArcVpnTunnelChromeProperty[] = "ArcVpn.TunnelChrome";
+constexpr char kArcVpnTunnelChromeProperty[] = "ArcVpn.TunnelChrome";
// IKEv2 VPN Service property names.
-const char kIKEv2AuthenticationTypeProperty[] = "IKEv2.AuthenticationType";
-const char kIKEv2CaCertPemProperty[] = "IKEv2.CACertPEM";
-const char kIKEv2ClientCertIdProperty[] = "IKEv2.ClientCertID";
-const char kIKEv2ClientCertSlotProperty[] = "IKEv2.ClientCertSlot";
-const char kIKEv2LocalIdentityProperty[] = "IKEv2.LocalIdentity";
-const char kIKEv2PskProperty[] = "IKEv2.PSK";
-const char kIKEv2RemoteIdentityProperty[] = "IKEv2.RemoteIdentity";
+constexpr char kIKEv2AuthenticationTypeProperty[] = "IKEv2.AuthenticationType";
+constexpr char kIKEv2CaCertPemProperty[] = "IKEv2.CACertPEM";
+constexpr char kIKEv2ClientCertIdProperty[] = "IKEv2.ClientCertID";
+constexpr char kIKEv2ClientCertSlotProperty[] = "IKEv2.ClientCertSlot";
+constexpr char kIKEv2LocalIdentityProperty[] = "IKEv2.LocalIdentity";
+constexpr char kIKEv2PskProperty[] = "IKEv2.PSK";
+constexpr char kIKEv2RemoteIdentityProperty[] = "IKEv2.RemoteIdentity";
// Values used in IKEv2.AuthenticationType.
-const char kIKEv2AuthenticationTypePSK[] = "PSK";
-const char kIKEv2AuthenticationTypeEAP[] = "EAP";
-const char kIKEv2AuthenticationTypeCert[] = "Cert";
+constexpr char kIKEv2AuthenticationTypePSK[] = "PSK";
+constexpr char kIKEv2AuthenticationTypeEAP[] = "EAP";
+constexpr char kIKEv2AuthenticationTypeCert[] = "Cert";
// L2TPIPsec Service property names.
-const char kL2TPIPsecCaCertPemProperty[] = "L2TPIPsec.CACertPEM";
-const char kL2TPIPsecClientCertIdProperty[] = "L2TPIPsec.ClientCertID";
-const char kL2TPIPsecClientCertSlotProperty[] = "L2TPIPsec.ClientCertSlot";
-const char kL2TPIPsecLcpEchoDisabledProperty[] = "L2TPIPsec.LCPEchoDisabled";
-const char kL2TPIPsecPasswordProperty[] = "L2TPIPsec.Password";
-const char kL2TPIPsecPinProperty[] = "L2TPIPsec.PIN";
-const char kL2TPIPsecPskProperty[] = "L2TPIPsec.PSK";
-const char kL2TPIPsecPskRequiredProperty[] = "L2TPIPsec.PSKRequired";
-const char kL2TPIPsecTunnelGroupProperty[] = "L2TPIPsec.TunnelGroup";
-const char kL2TPIPsecUseLoginPasswordProperty[] = "L2TPIPsec.UseLoginPassword";
-const char kL2TPIPsecUserProperty[] = "L2TPIPsec.User";
-const char kL2TPIPsecXauthPasswordProperty[] = "L2TPIPsec.XauthPassword";
-const char kL2TPIPsecXauthUserProperty[] = "L2TPIPsec.XauthUser";
+constexpr char kL2TPIPsecCaCertPemProperty[] = "L2TPIPsec.CACertPEM";
+constexpr char kL2TPIPsecClientCertIdProperty[] = "L2TPIPsec.ClientCertID";
+constexpr char kL2TPIPsecClientCertSlotProperty[] = "L2TPIPsec.ClientCertSlot";
+constexpr char kL2TPIPsecLcpEchoDisabledProperty[] =
+ "L2TPIPsec.LCPEchoDisabled";
+constexpr char kL2TPIPsecPasswordProperty[] = "L2TPIPsec.Password";
+constexpr char kL2TPIPsecPinProperty[] = "L2TPIPsec.PIN";
+constexpr char kL2TPIPsecPskProperty[] = "L2TPIPsec.PSK";
+constexpr char kL2TPIPsecPskRequiredProperty[] = "L2TPIPsec.PSKRequired";
+constexpr char kL2TPIPsecTunnelGroupProperty[] = "L2TPIPsec.TunnelGroup";
+constexpr char kL2TPIPsecUseLoginPasswordProperty[] =
+ "L2TPIPsec.UseLoginPassword";
+constexpr char kL2TPIPsecUserProperty[] = "L2TPIPsec.User";
+constexpr char kL2TPIPsecXauthPasswordProperty[] = "L2TPIPsec.XauthPassword";
+constexpr char kL2TPIPsecXauthUserProperty[] = "L2TPIPsec.XauthUser";
// OpenVPN Service property names.
-const char kOpenVPNAuthNoCacheProperty[] = "OpenVPN.AuthNoCache";
-const char kOpenVPNAuthProperty[] = "OpenVPN.Auth";
-const char kOpenVPNAuthRetryProperty[] = "OpenVPN.AuthRetry";
-const char kOpenVPNAuthUserPassProperty[] = "OpenVPN.AuthUserPass";
-const char kOpenVPNCaCertPemProperty[] = "OpenVPN.CACertPEM";
-const char kOpenVPNCipherProperty[] = "OpenVPN.Cipher";
-const char kOpenVPNClientCertIdProperty[] = "OpenVPN.Pkcs11.ID";
-const char kOpenVPNCompLZOProperty[] = "OpenVPN.CompLZO";
-const char kOpenVPNCompNoAdaptProperty[] = "OpenVPN.CompNoAdapt";
-const char kOpenVPNCompressProperty[] = "OpenVPN.Compress";
-const char kOpenVPNExtraCertPemProperty[] = "OpenVPN.ExtraCertPEM";
-const char kOpenVPNExtraHostsProperty[] = "OpenVPN.ExtraHosts";
-const char kOpenVPNIgnoreDefaultRouteProperty[] = "OpenVPN.IgnoreDefaultRoute";
-const char kOpenVPNKeyDirectionProperty[] = "OpenVPN.KeyDirection";
-const char kOpenVPNNsCertTypeProperty[] = "OpenVPN.NsCertType";
-const char kOpenVPNOTPProperty[] = "OpenVPN.OTP";
-const char kOpenVPNPasswordProperty[] = "OpenVPN.Password";
-const char kOpenVPNPinProperty[] = "OpenVPN.Pkcs11.PIN";
-const char kOpenVPNPingExitProperty[] = "OpenVPN.PingExit";
-const char kOpenVPNPingProperty[] = "OpenVPN.Ping";
-const char kOpenVPNPingRestartProperty[] = "OpenVPN.PingRestart";
-const char kOpenVPNPortProperty[] = "OpenVPN.Port";
-const char kOpenVPNProtoProperty[] = "OpenVPN.Proto";
-const char kOpenVPNPushPeerInfoProperty[] = "OpenVPN.PushPeerInfo";
-const char kOpenVPNRemoteCertEKUProperty[] = "OpenVPN.RemoteCertEKU";
-const char kOpenVPNRemoteCertKUProperty[] = "OpenVPN.RemoteCertKU";
-const char kOpenVPNRemoteCertTLSProperty[] = "OpenVPN.RemoteCertTLS";
-const char kOpenVPNRenegSecProperty[] = "OpenVPN.RenegSec";
-const char kOpenVPNServerPollTimeoutProperty[] = "OpenVPN.ServerPollTimeout";
-const char kOpenVPNShaperProperty[] = "OpenVPN.Shaper";
-const char kOpenVPNStaticChallengeProperty[] = "OpenVPN.StaticChallenge";
-const char kOpenVPNTLSAuthContentsProperty[] = "OpenVPN.TLSAuthContents";
-const char kOpenVPNTLSAuthProperty[] = "OpenVPN.TLSAuth";
-const char kOpenVPNTLSRemoteProperty[] = "OpenVPN.TLSRemote";
-const char kOpenVPNTLSVersionMinProperty[] = "OpenVPN.TLSVersionMin";
-const char kOpenVPNTokenProperty[] = "OpenVPN.Token";
-const char kOpenVPNUserProperty[] = "OpenVPN.User";
-const char kOpenVPNVerbProperty[] = "OpenVPN.Verb";
-const char kOpenVPNVerifyHashProperty[] = "OpenVPN.VerifyHash";
-const char kOpenVPNVerifyX509NameProperty[] = "OpenVPN.VerifyX509Name";
-const char kOpenVPNVerifyX509TypeProperty[] = "OpenVPN.VerifyX509Type";
-const char kVPNMTUProperty[] = "VPN.MTU";
+constexpr char kOpenVPNAuthNoCacheProperty[] = "OpenVPN.AuthNoCache";
+constexpr char kOpenVPNAuthProperty[] = "OpenVPN.Auth";
+constexpr char kOpenVPNAuthRetryProperty[] = "OpenVPN.AuthRetry";
+constexpr char kOpenVPNAuthUserPassProperty[] = "OpenVPN.AuthUserPass";
+constexpr char kOpenVPNCaCertPemProperty[] = "OpenVPN.CACertPEM";
+constexpr char kOpenVPNCipherProperty[] = "OpenVPN.Cipher";
+constexpr char kOpenVPNClientCertIdProperty[] = "OpenVPN.Pkcs11.ID";
+constexpr char kOpenVPNCompLZOProperty[] = "OpenVPN.CompLZO";
+constexpr char kOpenVPNCompNoAdaptProperty[] = "OpenVPN.CompNoAdapt";
+constexpr char kOpenVPNCompressProperty[] = "OpenVPN.Compress";
+constexpr char kOpenVPNExtraCertPemProperty[] = "OpenVPN.ExtraCertPEM";
+constexpr char kOpenVPNExtraHostsProperty[] = "OpenVPN.ExtraHosts";
+constexpr char kOpenVPNIgnoreDefaultRouteProperty[] =
+ "OpenVPN.IgnoreDefaultRoute";
+constexpr char kOpenVPNKeyDirectionProperty[] = "OpenVPN.KeyDirection";
+constexpr char kOpenVPNNsCertTypeProperty[] = "OpenVPN.NsCertType";
+constexpr char kOpenVPNOTPProperty[] = "OpenVPN.OTP";
+constexpr char kOpenVPNPasswordProperty[] = "OpenVPN.Password";
+constexpr char kOpenVPNPinProperty[] = "OpenVPN.Pkcs11.PIN";
+constexpr char kOpenVPNPingExitProperty[] = "OpenVPN.PingExit";
+constexpr char kOpenVPNPingProperty[] = "OpenVPN.Ping";
+constexpr char kOpenVPNPingRestartProperty[] = "OpenVPN.PingRestart";
+constexpr char kOpenVPNPortProperty[] = "OpenVPN.Port";
+constexpr char kOpenVPNProtoProperty[] = "OpenVPN.Proto";
+constexpr char kOpenVPNPushPeerInfoProperty[] = "OpenVPN.PushPeerInfo";
+constexpr char kOpenVPNRemoteCertEKUProperty[] = "OpenVPN.RemoteCertEKU";
+constexpr char kOpenVPNRemoteCertKUProperty[] = "OpenVPN.RemoteCertKU";
+constexpr char kOpenVPNRemoteCertTLSProperty[] = "OpenVPN.RemoteCertTLS";
+constexpr char kOpenVPNRenegSecProperty[] = "OpenVPN.RenegSec";
+constexpr char kOpenVPNServerPollTimeoutProperty[] =
+ "OpenVPN.ServerPollTimeout";
+constexpr char kOpenVPNShaperProperty[] = "OpenVPN.Shaper";
+constexpr char kOpenVPNStaticChallengeProperty[] = "OpenVPN.StaticChallenge";
+constexpr char kOpenVPNTLSAuthContentsProperty[] = "OpenVPN.TLSAuthContents";
+constexpr char kOpenVPNTLSAuthProperty[] = "OpenVPN.TLSAuth";
+constexpr char kOpenVPNTLSRemoteProperty[] = "OpenVPN.TLSRemote";
+constexpr char kOpenVPNTLSVersionMinProperty[] = "OpenVPN.TLSVersionMin";
+constexpr char kOpenVPNTokenProperty[] = "OpenVPN.Token";
+constexpr char kOpenVPNUserProperty[] = "OpenVPN.User";
+constexpr char kOpenVPNVerbProperty[] = "OpenVPN.Verb";
+constexpr char kOpenVPNVerifyHashProperty[] = "OpenVPN.VerifyHash";
+constexpr char kOpenVPNVerifyX509NameProperty[] = "OpenVPN.VerifyX509Name";
+constexpr char kOpenVPNVerifyX509TypeProperty[] = "OpenVPN.VerifyX509Type";
+constexpr char kVPNMTUProperty[] = "VPN.MTU";
// ThirdPartyVpn Service property names.
-const char kConfigurationNameProperty[] = "ConfigurationName";
-const char kExtensionNameProperty[] = "ExtensionName";
-const char kObjectPathSuffixProperty[] = "ObjectPathSuffix";
+constexpr char kConfigurationNameProperty[] = "ConfigurationName";
+constexpr char kExtensionNameProperty[] = "ExtensionName";
+constexpr char kObjectPathSuffixProperty[] = "ObjectPathSuffix";
// WireGuard Service property names.
-const char kWireGuardIPAddress[] = "WireGuard.IPAddress";
-const char kWireGuardPrivateKey[] = "WireGuard.PrivateKey";
-const char kWireGuardPublicKey[] = "WireGuard.PublicKey";
-const char kWireGuardPeers[] = "WireGuard.Peers";
+constexpr char kWireGuardIPAddress[] = "WireGuard.IPAddress";
+constexpr char kWireGuardPrivateKey[] = "WireGuard.PrivateKey";
+constexpr char kWireGuardPublicKey[] = "WireGuard.PublicKey";
+constexpr char kWireGuardPeers[] = "WireGuard.Peers";
// Property names of a peer in "WireGuard.Peers"
-const char kWireGuardPeerPublicKey[] = "PublicKey";
-const char kWireGuardPeerPresharedKey[] = "PresharedKey";
-const char kWireGuardPeerEndpoint[] = "Endpoint";
-const char kWireGuardPeerAllowedIPs[] = "AllowedIPs";
-const char kWireGuardPeerPersistentKeepalive[] = "PersistentKeepalive";
+constexpr char kWireGuardPeerPublicKey[] = "PublicKey";
+constexpr char kWireGuardPeerPresharedKey[] = "PresharedKey";
+constexpr char kWireGuardPeerEndpoint[] = "Endpoint";
+constexpr char kWireGuardPeerAllowedIPs[] = "AllowedIPs";
+constexpr char kWireGuardPeerPersistentKeepalive[] = "PersistentKeepalive";
// IPConfig property names.
// kAddressProperty: Defined below for Device.
-const char kBroadcastProperty[] = "Broadcast";
-const char kDomainNameProperty[] = "DomainName";
-const char kExcludedRoutesProperty[] = "ExcludedRoutes";
-const char kGatewayProperty[] = "Gateway";
-const char kIncludedRoutesProperty[] = "IncludedRoutes";
-const char kLeaseDurationSecondsProperty[] = "LeaseDurationSeconds";
-const char kMethodProperty[] = "Method";
-const char kMtuProperty[] = "Mtu";
-const char kNameServersProperty[] = "NameServers";
-const char kPeerAddressProperty[] = "PeerAddress";
-const char kPrefixlenProperty[] = "Prefixlen";
-const char kSearchDomainsProperty[] = "SearchDomains";
-const char kVendorEncapsulatedOptionsProperty[] = "VendorEncapsulatedOptions";
-const char kWebProxyAutoDiscoveryUrlProperty[] = "WebProxyAutoDiscoveryUrl";
-const char kiSNSOptionDataProperty[] = "iSNSOptionData"; // For RFC 4174.
+constexpr char kBroadcastProperty[] = "Broadcast";
+constexpr char kDomainNameProperty[] = "DomainName";
+constexpr char kExcludedRoutesProperty[] = "ExcludedRoutes";
+constexpr char kGatewayProperty[] = "Gateway";
+constexpr char kIncludedRoutesProperty[] = "IncludedRoutes";
+constexpr char kLeaseDurationSecondsProperty[] = "LeaseDurationSeconds";
+constexpr char kMethodProperty[] = "Method";
+constexpr char kMtuProperty[] = "Mtu";
+constexpr char kNameServersProperty[] = "NameServers";
+constexpr char kPeerAddressProperty[] = "PeerAddress";
+constexpr char kPrefixlenProperty[] = "Prefixlen";
+constexpr char kSearchDomainsProperty[] = "SearchDomains";
+constexpr char kVendorEncapsulatedOptionsProperty[] =
+ "VendorEncapsulatedOptions";
+constexpr char kWebProxyAutoDiscoveryUrlProperty[] = "WebProxyAutoDiscoveryUrl";
+constexpr char kiSNSOptionDataProperty[] = "iSNSOptionData"; // For RFC 4174.
// Passpoint credentials property names.
// EAP properties are defined above for EAP service.
-const char kPasspointCredentialsFQDNProperty[] = "FQDN";
-const char kPasspointCredentialsDomainsProperty[] = "Domains";
-const char kPasspointCredentialsRealmProperty[] = "Realm";
-const char kPasspointCredentialsHomeOIsProperty[] = "HomeOIs";
-const char kPasspointCredentialsRequiredHomeOIsProperty[] = "RequiredHomeOIs";
-const char kPasspointCredentialsRoamingConsortiaProperty[] = "RoamingConsortia";
-const char kPasspointCredentialsMeteredOverrideProperty[] = "MeteredOverride";
-const char kPasspointCredentialsAndroidPackageNameProperty[] =
+constexpr char kPasspointCredentialsFQDNProperty[] = "FQDN";
+constexpr char kPasspointCredentialsDomainsProperty[] = "Domains";
+constexpr char kPasspointCredentialsRealmProperty[] = "Realm";
+constexpr char kPasspointCredentialsHomeOIsProperty[] = "HomeOIs";
+constexpr char kPasspointCredentialsRequiredHomeOIsProperty[] =
+ "RequiredHomeOIs";
+constexpr char kPasspointCredentialsRoamingConsortiaProperty[] =
+ "RoamingConsortia";
+constexpr char kPasspointCredentialsMeteredOverrideProperty[] =
+ "MeteredOverride";
+constexpr char kPasspointCredentialsAndroidPackageNameProperty[] =
"AndroidPackageName";
-const char kPasspointCredentialsFriendlyNameProperty[] = "FriendlyName";
-const char kPasspointCredentialsExpirationTimeMillisecondsProperty[] =
+constexpr char kPasspointCredentialsFriendlyNameProperty[] = "FriendlyName";
+constexpr char kPasspointCredentialsExpirationTimeMillisecondsProperty[] =
"ExpirationTimeMilliseconds";
// Base Device property names.
-const char kAddressProperty[] = "Address"; // Also used for IPConfig.
-const char kInhibitedProperty[] = "Inhibited";
-const char kIPConfigsProperty[] = "IPConfigs";
-const char kIPv6DisabledProperty[] = "IPv6Disabled";
-const char kInterfaceProperty[] = "Interface"; // Network interface name.
+constexpr char kAddressProperty[] = "Address"; // Also used for IPConfig.
+constexpr char kInhibitedProperty[] = "Inhibited";
+constexpr char kIPConfigsProperty[] = "IPConfigs";
+constexpr char kIPv6DisabledProperty[] = "IPv6Disabled";
+constexpr char kInterfaceProperty[] = "Interface"; // Network interface name.
// kNameProperty: Defined above for Service. DEPRECATED (crbug.com/1011136).
-const char kPoweredProperty[] = "Powered";
-const char kScanIntervalProperty[] =
- "ScanInterval"; // For both Cellular and WiFi.
-const char kScanningProperty[] = "Scanning"; // For both Cellular and WiFi.
-const char kSelectedServiceProperty[] = "SelectedService";
+constexpr char kPoweredProperty[] = "Powered";
+constexpr char kScanIntervalProperty[] =
+ "ScanInterval"; // For both Cellular and WiFi.
+constexpr char kScanningProperty[] = "Scanning"; // For both Cellular and WiFi.
+constexpr char kSelectedServiceProperty[] = "SelectedService";
// Property names common to Cellular Device and Cellular Service.
-const char kEidProperty[] = "Cellular.EID";
-const char kIccidProperty[] = "Cellular.ICCID";
-const char kImsiProperty[] = "Cellular.IMSI";
+constexpr char kEidProperty[] = "Cellular.EID";
+constexpr char kIccidProperty[] = "Cellular.ICCID";
+constexpr char kImsiProperty[] = "Cellular.IMSI";
// kIccidProperty value when SIM card exists but ICCID is not available.
-const char kUnknownIccid[] = "unknown-iccid";
+constexpr char kUnknownIccid[] = "unknown-iccid";
// Cellular Device property names.
-const char kCellularApnListProperty[] = "Cellular.APNList";
-const char kCellularPolicyAllowRoamingProperty[] =
+constexpr char kCellularApnListProperty[] = "Cellular.APNList";
+constexpr char kCellularPolicyAllowRoamingProperty[] =
"Cellular.PolicyAllowRoaming";
-const char kDeviceIdProperty[] = "Cellular.DeviceID";
-const char kEquipmentIdProperty[] = "Cellular.EquipmentID";
-const char kEsnProperty[] = "Cellular.ESN";
-const char kFirmwareRevisionProperty[] = "Cellular.FirmwareRevision";
-const char kFoundNetworksProperty[] = "Cellular.FoundNetworks";
-const char kHardwareRevisionProperty[] = "Cellular.HardwareRevision";
-const char kHomeProviderProperty[] = "Cellular.HomeProvider";
-const char kImeiProperty[] = "Cellular.IMEI";
-const char kManufacturerProperty[] = "Cellular.Manufacturer";
-const char kMdnProperty[] = "Cellular.MDN";
-const char kMeidProperty[] = "Cellular.MEID";
-const char kModelIdProperty[] = "Cellular.ModelID";
-const char kMinProperty[] = "Cellular.MIN";
-const char kProviderRequiresRoamingProperty[] =
+constexpr char kDeviceIdProperty[] = "Cellular.DeviceID";
+constexpr char kEquipmentIdProperty[] = "Cellular.EquipmentID";
+constexpr char kEsnProperty[] = "Cellular.ESN";
+constexpr char kFirmwareRevisionProperty[] = "Cellular.FirmwareRevision";
+constexpr char kFoundNetworksProperty[] = "Cellular.FoundNetworks";
+constexpr char kHardwareRevisionProperty[] = "Cellular.HardwareRevision";
+constexpr char kHomeProviderProperty[] = "Cellular.HomeProvider";
+constexpr char kImeiProperty[] = "Cellular.IMEI";
+constexpr char kManufacturerProperty[] = "Cellular.Manufacturer";
+constexpr char kMdnProperty[] = "Cellular.MDN";
+constexpr char kMeidProperty[] = "Cellular.MEID";
+constexpr char kModelIdProperty[] = "Cellular.ModelID";
+constexpr char kMinProperty[] = "Cellular.MIN";
+constexpr char kProviderRequiresRoamingProperty[] =
"Cellular.ProviderRequiresRoaming";
-const char kSelectedNetworkProperty[] = "Cellular.SelectedNetwork";
-const char kSIMPresentProperty[] = "Cellular.SIMPresent";
-const char kSIMSlotInfoProperty[] = "Cellular.SIMSlotInfo";
-const char kSupportNetworkScanProperty[] = "Cellular.SupportNetworkScan";
-const char kUseAttachAPNProperty[] = "Cellular.UseAttachAPN";
-const char kPrimaryMultiplexedInterfaceProperty[] =
+constexpr char kSelectedNetworkProperty[] = "Cellular.SelectedNetwork";
+constexpr char kSIMPresentProperty[] = "Cellular.SIMPresent";
+constexpr char kSIMSlotInfoProperty[] = "Cellular.SIMSlotInfo";
+constexpr char kSupportNetworkScanProperty[] = "Cellular.SupportNetworkScan";
+constexpr char kUseAttachAPNProperty[] = "Cellular.UseAttachAPN";
+constexpr char kPrimaryMultiplexedInterfaceProperty[] =
"Cellular.PrimaryMultiplexedInterface";
-const char kDBusObjectProperty[] = "DBus.Object";
-const char kDBusServiceProperty[] = "DBus.Service";
+constexpr char kDBusObjectProperty[] = "DBus.Object";
+constexpr char kDBusServiceProperty[] = "DBus.Service";
// Ethernet Device property names.
-const char kEapAuthenticationCompletedProperty[] = "EapAuthenticationCompleted";
-const char kEapAuthenticatorDetectedProperty[] = "EapAuthenticatorDetected";
-const char kDeviceBusTypeProperty[] = "Ethernet.DeviceBusType";
-const char kLinkUpProperty[] = "Ethernet.LinkUp";
-const char kUsbEthernetMacAddressSourceProperty[] =
+constexpr char kEapAuthenticationCompletedProperty[] =
+ "EapAuthenticationCompleted";
+constexpr char kEapAuthenticatorDetectedProperty[] = "EapAuthenticatorDetected";
+constexpr char kDeviceBusTypeProperty[] = "Ethernet.DeviceBusType";
+constexpr char kLinkUpProperty[] = "Ethernet.LinkUp";
+constexpr char kUsbEthernetMacAddressSourceProperty[] =
"Ethernet.UsbEthernetMacAddressSource";
// WiFi Device property names.
-const char kBgscanMethodProperty[] = "BgscanMethod";
-const char kBgscanShortIntervalProperty[] = "BgscanShortInterval";
-const char kBgscanSignalThresholdProperty[] = "BgscanSignalThreshold";
-const char kForceWakeToScanTimerProperty[] = "ForceWakeToScanTimer";
-const char kLastWakeReasonProperty[] = "LastWakeReason";
-const char kLinkStatisticsProperty[] = "LinkStatistics";
-const char kMacAddressRandomizationEnabledProperty[] =
+constexpr char kBgscanMethodProperty[] = "BgscanMethod";
+constexpr char kBgscanShortIntervalProperty[] = "BgscanShortInterval";
+constexpr char kBgscanSignalThresholdProperty[] = "BgscanSignalThreshold";
+constexpr char kForceWakeToScanTimerProperty[] = "ForceWakeToScanTimer";
+constexpr char kLastWakeReasonProperty[] = "LastWakeReason";
+constexpr char kLinkStatisticsProperty[] = "LinkStatistics";
+constexpr char kMacAddressRandomizationEnabledProperty[] =
"MACAddressRandomizationEnabled";
-const char kMacAddressRandomizationSupportedProperty[] =
+constexpr char kMacAddressRandomizationSupportedProperty[] =
"MACAddressRandomizationSupported";
-const char kNetDetectScanPeriodSecondsProperty[] = "NetDetectScanPeriodSeconds";
-const char kPasspointInterworkingSelectEnabledProperty[] =
+constexpr char kNetDetectScanPeriodSecondsProperty[] =
+ "NetDetectScanPeriodSeconds";
+constexpr char kPasspointInterworkingSelectEnabledProperty[] =
"PasspointInterworkingSelectEnabled";
-const char kWakeOnWiFiSupportedProperty[] = "WakeOnWiFiSupported";
-const char kWakeOnWiFiAllowedProperty[] = "WakeOnWiFiAllowed";
-const char kWakeOnWiFiFeaturesEnabledProperty[] = "WakeOnWiFiFeaturesEnabled";
-const char kWakeToScanPeriodSecondsProperty[] = "WakeToScanPeriodSeconds";
+constexpr char kWakeOnWiFiSupportedProperty[] = "WakeOnWiFiSupported";
+constexpr char kWakeOnWiFiAllowedProperty[] = "WakeOnWiFiAllowed";
+constexpr char kWakeOnWiFiFeaturesEnabledProperty[] =
+ "WakeOnWiFiFeaturesEnabled";
+constexpr char kWakeToScanPeriodSecondsProperty[] = "WakeToScanPeriodSeconds";
// Profile property names.
-const char kEntriesProperty[] = "Entries";
+constexpr char kEntriesProperty[] = "Entries";
// kNameProperty: Defined above for Service.
// kServicesProperty: Defined above for Manager.
-const char kUserHashProperty[] = "UserHash";
-const char kAlwaysOnVpnModeProperty[] = "AlwaysOnVpnMode";
-const char kAlwaysOnVpnServiceProperty[] = "AlwaysOnVpnService";
+constexpr char kUserHashProperty[] = "UserHash";
+constexpr char kAlwaysOnVpnModeProperty[] = "AlwaysOnVpnMode";
+constexpr char kAlwaysOnVpnServiceProperty[] = "AlwaysOnVpnService";
// WiFi Service VendorInformation dictionary keys.
-const char kVendorOUIListProperty[] = "OUIList";
-const char kVendorWPSDeviceNameProperty[] = "DeviceName";
-const char kVendorWPSManufacturerProperty[] = "Manufacturer";
-const char kVendorWPSModelNameProperty[] = "ModelName";
-const char kVendorWPSModelNumberProperty[] = "ModelNumber";
+constexpr char kVendorOUIListProperty[] = "OUIList";
+constexpr char kVendorWPSDeviceNameProperty[] = "DeviceName";
+constexpr char kVendorWPSManufacturerProperty[] = "Manufacturer";
+constexpr char kVendorWPSModelNameProperty[] = "ModelName";
+constexpr char kVendorWPSModelNumberProperty[] = "ModelNumber";
// Flimflam state options.
-const char kStateIdle[] = "idle";
-const char kStateAssociation[] = "association";
-const char kStateConfiguration[] = "configuration";
-const char kStateReady[] = "ready";
-const char kStateNoConnectivity[] = "no-connectivity";
-const char kStateRedirectFound[] = "redirect-found";
-const char kStatePortalSuspected[] = "portal-suspected";
+constexpr char kStateIdle[] = "idle";
+constexpr char kStateAssociation[] = "association";
+constexpr char kStateConfiguration[] = "configuration";
+constexpr char kStateReady[] = "ready";
+constexpr char kStateNoConnectivity[] = "no-connectivity";
+constexpr char kStateRedirectFound[] = "redirect-found";
+constexpr char kStatePortalSuspected[] = "portal-suspected";
// TODO(b/260792466): This state is only used in the State property of Manager.
// Consider changing the to kStateIdle too, or removing the State property
// altogether if nothing depends on it.
-const char kStateOffline[] = "offline";
-const char kStateOnline[] = "online";
-const char kStateDisconnect[] = "disconnecting";
-const char kStateFailure[] = "failure";
+constexpr char kStateOffline[] = "offline";
+constexpr char kStateOnline[] = "online";
+constexpr char kStateDisconnect[] = "disconnecting";
+constexpr char kStateFailure[] = "failure";
// Shill WiFi roam state options.
-const char kRoamStateIdle[] = "idle";
-const char kRoamStateAssociation[] = "association";
-const char kRoamStateConfiguration[] = "configuration";
-const char kRoamStateReady[] = "ready";
+constexpr char kRoamStateIdle[] = "idle";
+constexpr char kRoamStateAssociation[] = "association";
+constexpr char kRoamStateConfiguration[] = "configuration";
+constexpr char kRoamStateReady[] = "ready";
// Shill Passpoint match type options.
-const char kPasspointMatchTypeHome[] = "home";
-const char kPasspointMatchTypeRoaming[] = "roaming";
-const char kPasspointMatchTypeUnknown[] = "unknown";
+constexpr char kPasspointMatchTypeHome[] = "home";
+constexpr char kPasspointMatchTypeRoaming[] = "roaming";
+constexpr char kPasspointMatchTypeUnknown[] = "unknown";
// Flimflam portal phase and status.
-const char kPortalDetectionPhaseConnection[] = "Connection";
-const char kPortalDetectionPhaseDns[] = "DNS";
-const char kPortalDetectionPhaseHttp[] = "HTTP";
-const char kPortalDetectionPhaseContent[] = "Content";
-const char kPortalDetectionPhaseUnknown[] = "Unknown";
-const char kPortalDetectionStatusFailure[] = "Failure";
-const char kPortalDetectionStatusTimeout[] = "Timeout";
-const char kPortalDetectionStatusSuccess[] = "Success";
-const char kPortalDetectionStatusRedirect[] = "Redirect";
+constexpr char kPortalDetectionPhaseConnection[] = "Connection";
+constexpr char kPortalDetectionPhaseDns[] = "DNS";
+constexpr char kPortalDetectionPhaseHttp[] = "HTTP";
+constexpr char kPortalDetectionPhaseContent[] = "Content";
+constexpr char kPortalDetectionPhaseUnknown[] = "Unknown";
+constexpr char kPortalDetectionStatusFailure[] = "Failure";
+constexpr char kPortalDetectionStatusTimeout[] = "Timeout";
+constexpr char kPortalDetectionStatusSuccess[] = "Success";
+constexpr char kPortalDetectionStatusRedirect[] = "Redirect";
// Flimflam property names for SIMLock status.
// kSIMLockStatusProperty is a Cellular Device property.
-const char kSIMLockStatusProperty[] = "Cellular.SIMLockStatus";
-const char kSIMLockTypeProperty[] = "LockType";
-const char kSIMLockRetriesLeftProperty[] = "RetriesLeft";
-const char kSIMLockEnabledProperty[] = "LockEnabled";
+constexpr char kSIMLockStatusProperty[] = "Cellular.SIMLockStatus";
+constexpr char kSIMLockTypeProperty[] = "LockType";
+constexpr char kSIMLockRetriesLeftProperty[] = "RetriesLeft";
+constexpr char kSIMLockEnabledProperty[] = "LockEnabled";
// Shill SIMSlotInfo properties.
-const char kSIMSlotInfoEID[] = "EID";
-const char kSIMSlotInfoICCID[] = "ICCID";
-const char kSIMSlotInfoPrimary[] = "Primary";
+constexpr char kSIMSlotInfoEID[] = "EID";
+constexpr char kSIMSlotInfoICCID[] = "ICCID";
+constexpr char kSIMSlotInfoPrimary[] = "Primary";
// Flimflam property names for Cellular.FoundNetworks.
-const char kLongNameProperty[] = "long_name";
-const char kStatusProperty[] = "status";
-const char kShortNameProperty[] = "short_name";
-const char kTechnologyProperty[] = "technology";
-const char kNetworkIdProperty[] = "network_id";
+constexpr char kLongNameProperty[] = "long_name";
+constexpr char kStatusProperty[] = "status";
+constexpr char kShortNameProperty[] = "short_name";
+constexpr char kTechnologyProperty[] = "technology";
+constexpr char kNetworkIdProperty[] = "network_id";
// Flimflam SIMLock status types.
-const char kSIMLockPin[] = "sim-pin";
-const char kSIMLockPuk[] = "sim-puk";
+constexpr char kSIMLockPin[] = "sim-pin";
+constexpr char kSIMLockPuk[] = "sim-puk";
// APN info property names.
-const char kApnProperty[] = "apn";
-const char kApnNetworkIdProperty[] = "network_id";
-const char kApnUsernameProperty[] = "username";
-const char kApnPasswordProperty[] = "password";
-const char kApnNameProperty[] = "name";
-const char kApnLocalizedNameProperty[] = "localized_name";
-const char kApnLanguageProperty[] = "language";
-const char kApnAuthenticationProperty[] = "authentication";
-const char kApnIsRequiredByCarrierSpecProperty[] =
+constexpr char kApnProperty[] = "apn";
+constexpr char kApnNetworkIdProperty[] = "network_id";
+constexpr char kApnUsernameProperty[] = "username";
+constexpr char kApnPasswordProperty[] = "password";
+constexpr char kApnNameProperty[] = "name";
+constexpr char kApnLocalizedNameProperty[] = "localized_name";
+constexpr char kApnLanguageProperty[] = "language";
+constexpr char kApnAuthenticationProperty[] = "authentication";
+constexpr char kApnIsRequiredByCarrierSpecProperty[] =
"is_required_by_carrier_spec";
// TODO(b/251551314): Remove kApnAttachProperty after 2025Q2
-const char kApnAttachProperty[] = "attach";
-const char kApnIpTypeProperty[] = "ip_type";
-const char kApnTypesProperty[] = "apn_types";
-const char kApnIdProperty[] = "id";
-const char kApnSourceProperty[] = "apn_source";
+constexpr char kApnAttachProperty[] = "attach";
+constexpr char kApnIpTypeProperty[] = "ip_type";
+constexpr char kApnTypesProperty[] = "apn_types";
+constexpr char kApnIdProperty[] = "id";
+constexpr char kApnSourceProperty[] = "apn_source";
// APN authentication property values (as expected by ModemManager).
-const char kApnAuthenticationPap[] = "pap";
-const char kApnAuthenticationChap[] = "chap";
+constexpr char kApnAuthenticationPap[] = "pap";
+constexpr char kApnAuthenticationChap[] = "chap";
// IP type property values.
-const char kApnIpTypeV4[] = "ipv4";
-const char kApnIpTypeV6[] = "ipv6";
-const char kApnIpTypeV4V6[] = "ipv4v6";
+constexpr char kApnIpTypeV4[] = "ipv4";
+constexpr char kApnIpTypeV6[] = "ipv6";
+constexpr char kApnIpTypeV4V6[] = "ipv4v6";
// APN type property values.
-const char kApnTypeDefault[] = "DEFAULT";
-const char kApnTypeIA[] = "IA";
-const char kApnTypeDun[] = "DUN";
+constexpr char kApnTypeDefault[] = "DEFAULT";
+constexpr char kApnTypeIA[] = "IA";
+constexpr char kApnTypeDun[] = "DUN";
// APN source property values.
-const char kApnSourceAdmin[] = "admin";
-const char kApnSourceUi[] = "ui";
+constexpr char kApnSourceAdmin[] = "admin";
+constexpr char kApnSourceUi[] = "ui";
// APN IsRequiredByCarrierSpec values.
-const char kApnIsRequiredByCarrierSpecTrue[] = "1";
-const char kApnIsRequiredByCarrierSpecFalse[] = "0";
+constexpr char kApnIsRequiredByCarrierSpecTrue[] = "1";
+constexpr char kApnIsRequiredByCarrierSpecFalse[] = "0";
// Payment Portal property names.
-const char kPaymentPortalURL[] = "url";
-const char kPaymentPortalMethod[] = "method";
-const char kPaymentPortalPostData[] = "postdata";
+constexpr char kPaymentPortalURL[] = "url";
+constexpr char kPaymentPortalMethod[] = "method";
+constexpr char kPaymentPortalPostData[] = "postdata";
// Operator info property names.
-const char kOperatorNameKey[] = "name";
-const char kOperatorCodeKey[] = "code";
-const char kOperatorCountryKey[] = "country";
-const char kOperatorUuidKey[] = "uuid";
+constexpr char kOperatorNameKey[] = "name";
+constexpr char kOperatorCodeKey[] = "code";
+constexpr char kOperatorCountryKey[] = "country";
+constexpr char kOperatorUuidKey[] = "uuid";
// Flimflam network technology options.
-const char kNetworkTechnology1Xrtt[] = "1xRTT";
-const char kNetworkTechnologyEvdo[] = "EVDO";
-const char kNetworkTechnologyGsm[] = "GSM";
-const char kNetworkTechnologyGprs[] = "GPRS";
-const char kNetworkTechnologyEdge[] = "EDGE";
-const char kNetworkTechnologyUmts[] = "UMTS";
-const char kNetworkTechnologyHspa[] = "HSPA";
-const char kNetworkTechnologyHspaPlus[] = "HSPA+";
-const char kNetworkTechnologyLte[] = "LTE";
-const char kNetworkTechnologyLteAdvanced[] = "LTE Advanced";
-const char kNetworkTechnology5gNr[] = "5GNR";
+constexpr char kNetworkTechnology1Xrtt[] = "1xRTT";
+constexpr char kNetworkTechnologyEvdo[] = "EVDO";
+constexpr char kNetworkTechnologyGsm[] = "GSM";
+constexpr char kNetworkTechnologyGprs[] = "GPRS";
+constexpr char kNetworkTechnologyEdge[] = "EDGE";
+constexpr char kNetworkTechnologyUmts[] = "UMTS";
+constexpr char kNetworkTechnologyHspa[] = "HSPA";
+constexpr char kNetworkTechnologyHspaPlus[] = "HSPA+";
+constexpr char kNetworkTechnologyLte[] = "LTE";
+constexpr char kNetworkTechnologyLteAdvanced[] = "LTE Advanced";
+constexpr char kNetworkTechnology5gNr[] = "5GNR";
// Flimflam roaming state options
-const char kRoamingStateHome[] = "home";
-const char kRoamingStateRoaming[] = "roaming";
-const char kRoamingStateUnknown[] = "unknown";
+constexpr char kRoamingStateHome[] = "home";
+constexpr char kRoamingStateRoaming[] = "roaming";
+constexpr char kRoamingStateUnknown[] = "unknown";
// Flimflam activation state options
-const char kActivationStateActivated[] = "activated";
-const char kActivationStateActivating[] = "activating";
-const char kActivationStateNotActivated[] = "not-activated";
-const char kActivationStatePartiallyActivated[] = "partially-activated";
-const char kActivationStateUnknown[] = "unknown";
+constexpr char kActivationStateActivated[] = "activated";
+constexpr char kActivationStateActivating[] = "activating";
+constexpr char kActivationStateNotActivated[] = "not-activated";
+constexpr char kActivationStatePartiallyActivated[] = "partially-activated";
+constexpr char kActivationStateUnknown[] = "unknown";
// Flimflam EAP method options.
-const char kEapMethodPEAP[] = "PEAP";
-const char kEapMethodTLS[] = "TLS";
-const char kEapMethodTTLS[] = "TTLS";
-const char kEapMethodLEAP[] = "LEAP";
-const char kEapMethodMSCHAPV2[] = "MSCHAPV2";
+constexpr char kEapMethodPEAP[] = "PEAP";
+constexpr char kEapMethodTLS[] = "TLS";
+constexpr char kEapMethodTTLS[] = "TTLS";
+constexpr char kEapMethodLEAP[] = "LEAP";
+constexpr char kEapMethodMSCHAPV2[] = "MSCHAPV2";
// Flimflam EAP phase 2 auth options.
-const char kEapPhase2AuthPEAPMD5[] = "auth=MD5";
-const char kEapPhase2AuthPEAPMSCHAPV2[] = "auth=MSCHAPV2";
-const char kEapPhase2AuthPEAPGTC[] = "auth=GTC";
-const char kEapPhase2AuthTTLSMD5[] = "autheap=MD5"; // crosbug/26822
-const char kEapPhase2AuthTTLSEAPMD5[] = "autheap=MD5";
-const char kEapPhase2AuthTTLSEAPMSCHAPV2[] = "autheap=MSCHAPV2";
-const char kEapPhase2AuthTTLSMSCHAPV2[] = "auth=MSCHAPV2";
-const char kEapPhase2AuthTTLSMSCHAP[] = "auth=MSCHAP";
-const char kEapPhase2AuthTTLSPAP[] = "auth=PAP";
-const char kEapPhase2AuthTTLSCHAP[] = "auth=CHAP";
-const char kEapPhase2AuthTTLSGTC[] = "auth=GTC";
-const char kEapPhase2AuthTTLSEAPGTC[] = "autheap=GTC";
+constexpr char kEapPhase2AuthPEAPMD5[] = "auth=MD5";
+constexpr char kEapPhase2AuthPEAPMSCHAPV2[] = "auth=MSCHAPV2";
+constexpr char kEapPhase2AuthPEAPGTC[] = "auth=GTC";
+constexpr char kEapPhase2AuthTTLSMD5[] = "autheap=MD5"; // crosbug/26822
+constexpr char kEapPhase2AuthTTLSEAPMD5[] = "autheap=MD5";
+constexpr char kEapPhase2AuthTTLSEAPMSCHAPV2[] = "autheap=MSCHAPV2";
+constexpr char kEapPhase2AuthTTLSMSCHAPV2[] = "auth=MSCHAPV2";
+constexpr char kEapPhase2AuthTTLSMSCHAP[] = "auth=MSCHAP";
+constexpr char kEapPhase2AuthTTLSPAP[] = "auth=PAP";
+constexpr char kEapPhase2AuthTTLSCHAP[] = "auth=CHAP";
+constexpr char kEapPhase2AuthTTLSGTC[] = "auth=GTC";
+constexpr char kEapPhase2AuthTTLSEAPGTC[] = "autheap=GTC";
// Flimflam EAP TLS versions.
-const char kEapTLSVersion1p0[] = "1.0";
-const char kEapTLSVersion1p1[] = "1.1";
-const char kEapTLSVersion1p2[] = "1.2";
+constexpr char kEapTLSVersion1p0[] = "1.0";
+constexpr char kEapTLSVersion1p1[] = "1.1";
+constexpr char kEapTLSVersion1p2[] = "1.2";
// Flimflam VPN provider types.
-const char kProviderArcVpn[] = "arcvpn";
-const char kProviderIKEv2[] = "ikev2";
-const char kProviderL2tpIpsec[] = "l2tpipsec";
-const char kProviderOpenVpn[] = "openvpn";
-const char kProviderThirdPartyVpn[] = "thirdpartyvpn";
-const char kProviderWireGuard[] = "wireguard";
+constexpr char kProviderArcVpn[] = "arcvpn";
+constexpr char kProviderIKEv2[] = "ikev2";
+constexpr char kProviderL2tpIpsec[] = "l2tpipsec";
+constexpr char kProviderOpenVpn[] = "openvpn";
+constexpr char kProviderThirdPartyVpn[] = "thirdpartyvpn";
+constexpr char kProviderWireGuard[] = "wireguard";
// Flimflam monitored properties
-const char kMonitorPropertyChanged[] = "PropertyChanged";
+constexpr char kMonitorPropertyChanged[] = "PropertyChanged";
// Flimflam type options.
-const char kTypeEthernet[] = "ethernet";
-const char kTypeWifi[] = "wifi";
-const char kTypeCellular[] = "cellular";
-const char kTypeVPN[] = "vpn";
+constexpr char kTypeEthernet[] = "ethernet";
+constexpr char kTypeWifi[] = "wifi";
+constexpr char kTypeCellular[] = "cellular";
+constexpr char kTypeVPN[] = "vpn";
// Flimflam mode options.
-const char kModeManaged[] = "managed";
+constexpr char kModeManaged[] = "managed";
// WiFi SecurityClass options.
-const char kSecurityClassNone[] = "none";
-const char kSecurityClassWep[] = "wep";
-const char kSecurityClassPsk[] = "psk";
-const char kSecurityClass8021x[] = "802_1x";
+constexpr char kSecurityClassNone[] = "none";
+constexpr char kSecurityClassWep[] = "wep";
+constexpr char kSecurityClassPsk[] = "psk";
+constexpr char kSecurityClass8021x[] = "802_1x";
// These two are deprecated. Use kSecurityClass* equivalents above.
// TODO(b/226138492) Remove this once references in Chrome and Shill are
// removed.
-const char kSecurityPsk[] = "psk";
-const char kSecurity8021x[] = "802_1x";
+constexpr char kSecurityPsk[] = "psk";
+constexpr char kSecurity8021x[] = "802_1x";
// WiFi Security options.
-const char kSecurityNone[] = "none";
-const char kSecurityWep[] = "wep";
-const char kSecurityWpa[] = "wpa";
-const char kSecurityWpaWpa2[] = "wpa+wpa2";
-const char kSecurityWpaAll[] = "wpa-all";
+constexpr char kSecurityNone[] = "none";
+constexpr char kSecurityWep[] = "wep";
+constexpr char kSecurityWpa[] = "wpa";
+constexpr char kSecurityWpaWpa2[] = "wpa+wpa2";
+constexpr char kSecurityWpaAll[] = "wpa-all";
// Deprecated. Use kSecurityWpa2 instead.
// TODO(b/226138492) Remove this once references in Chrome and Shill are
// removed.
-const char kSecurityRsn[] = "rsn";
-const char kSecurityWpa2[] = "wpa2";
-const char kSecurityWpa2Wpa3[] = "wpa2+wpa3";
-const char kSecurityWpa3[] = "wpa3";
-const char kSecurityWpaEnterprise[] = "wpa-ent";
-const char kSecurityWpaWpa2Enterprise[] = "wpa+wpa2-ent";
-const char kSecurityWpaAllEnterprise[] = "wpa-all-ent";
-const char kSecurityWpa2Enterprise[] = "wpa2-ent";
-const char kSecurityWpa2Wpa3Enterprise[] = "wpa2+wpa3-ent";
-const char kSecurityWpa3Enterprise[] = "wpa3-ent";
+constexpr char kSecurityRsn[] = "rsn";
+constexpr char kSecurityWpa2[] = "wpa2";
+constexpr char kSecurityWpa2Wpa3[] = "wpa2+wpa3";
+constexpr char kSecurityWpa3[] = "wpa3";
+constexpr char kSecurityWpaEnterprise[] = "wpa-ent";
+constexpr char kSecurityWpaWpa2Enterprise[] = "wpa+wpa2-ent";
+constexpr char kSecurityWpaAllEnterprise[] = "wpa-all-ent";
+constexpr char kSecurityWpa2Enterprise[] = "wpa2-ent";
+constexpr char kSecurityWpa2Wpa3Enterprise[] = "wpa2+wpa3-ent";
+constexpr char kSecurityWpa3Enterprise[] = "wpa3-ent";
// WiFi Band options.
-const char kBand2GHz[] = "2.4GHz";
-const char kBand5GHz[] = "5GHz";
-const char kBandAll[] = "all-bands";
-const char kBandUnknown[] = "unknown";
+constexpr char kBand2GHz[] = "2.4GHz";
+constexpr char kBand5GHz[] = "5GHz";
+constexpr char kBandAll[] = "all-bands";
+constexpr char kBandUnknown[] = "unknown";
// Compress option values as expected by OpenVPN.
-const char kOpenVPNCompressFramingOnly[] = "";
-const char kOpenVPNCompressLz4[] = "lz4";
-const char kOpenVPNCompressLz4V2[] = "lz4-v2";
-const char kOpenVPNCompressLzo[] = "lzo";
+constexpr char kOpenVPNCompressFramingOnly[] = "";
+constexpr char kOpenVPNCompressLz4[] = "lz4";
+constexpr char kOpenVPNCompressLz4V2[] = "lz4-v2";
+constexpr char kOpenVPNCompressLzo[] = "lzo";
// FlimFlam technology family options
-const char kTechnologyFamilyCdma[] = "CDMA";
-const char kTechnologyFamilyGsm[] = "GSM";
+constexpr char kTechnologyFamilyCdma[] = "CDMA";
+constexpr char kTechnologyFamilyGsm[] = "GSM";
// IPConfig type options.
-const char kTypeIPv4[] = "ipv4";
-const char kTypeIPv6[] = "ipv6";
-const char kTypeDHCP[] = "dhcp";
-const char kTypeBOOTP[] = "bootp";
-const char kTypeZeroConf[] = "zeroconf";
-const char kTypeDHCP6[] = "dhcp6";
+constexpr char kTypeIPv4[] = "ipv4";
+constexpr char kTypeIPv6[] = "ipv6";
+constexpr char kTypeDHCP[] = "dhcp";
+constexpr char kTypeBOOTP[] = "bootp";
+constexpr char kTypeZeroConf[] = "zeroconf";
+constexpr char kTypeDHCP6[] = "dhcp6";
// kTypeVPN[] = "vpn" is defined above in device type session.
// Flimflam error options.
-const char kErrorAaaFailed[] = "aaa-failed";
-const char kErrorActivationFailed[] = "activation-failed";
-const char kErrorBadPassphrase[] = "bad-passphrase";
-const char kErrorBadWEPKey[] = "bad-wepkey";
-const char kErrorConnectFailed[] = "connect-failed";
-const char kErrorDNSLookupFailed[] = "dns-lookup-failed";
-const char kErrorDhcpFailed[] = "dhcp-failed";
-const char kErrorHTTPGetFailed[] = "http-get-failed";
-const char kErrorInternal[] = "internal-error";
-const char kErrorInvalidFailure[] = "invalid-failure";
-const char kErrorInvalidAPN[] = "invalid-apn";
-const char kErrorIpsecCertAuthFailed[] = "ipsec-cert-auth-failed";
-const char kErrorIpsecPskAuthFailed[] = "ipsec-psk-auth-failed";
-const char kErrorNeedEvdo[] = "need-evdo";
-const char kErrorNeedHomeNetwork[] = "need-home-network";
-const char kErrorNoFailure[] = "no-failure";
-const char kErrorNotAssociated[] = "not-associated";
-const char kErrorNotAuthenticated[] = "not-authenticated";
-const char kErrorOtaspFailed[] = "otasp-failed";
-const char kErrorOutOfRange[] = "out-of-range";
-const char kErrorPinMissing[] = "pin-missing";
-const char kErrorPppAuthFailed[] = "ppp-auth-failed";
-const char kErrorSimLocked[] = "sim-locked";
-const char kErrorNotRegistered[] = "not-registered";
-const char kErrorTooManySTAs[] = "too-many-stas";
-const char kErrorDisconnect[] = "disconnect-failure";
-const char kErrorUnknownFailure[] = "unknown-failure";
+constexpr char kErrorAaaFailed[] = "aaa-failed";
+constexpr char kErrorActivationFailed[] = "activation-failed";
+constexpr char kErrorBadPassphrase[] = "bad-passphrase";
+constexpr char kErrorBadWEPKey[] = "bad-wepkey";
+constexpr char kErrorConnectFailed[] = "connect-failed";
+constexpr char kErrorDNSLookupFailed[] = "dns-lookup-failed";
+constexpr char kErrorDhcpFailed[] = "dhcp-failed";
+constexpr char kErrorHTTPGetFailed[] = "http-get-failed";
+constexpr char kErrorInternal[] = "internal-error";
+constexpr char kErrorInvalidFailure[] = "invalid-failure";
+constexpr char kErrorInvalidAPN[] = "invalid-apn";
+constexpr char kErrorIpsecCertAuthFailed[] = "ipsec-cert-auth-failed";
+constexpr char kErrorIpsecPskAuthFailed[] = "ipsec-psk-auth-failed";
+constexpr char kErrorNeedEvdo[] = "need-evdo";
+constexpr char kErrorNeedHomeNetwork[] = "need-home-network";
+constexpr char kErrorNoFailure[] = "no-failure";
+constexpr char kErrorNotAssociated[] = "not-associated";
+constexpr char kErrorNotAuthenticated[] = "not-authenticated";
+constexpr char kErrorOtaspFailed[] = "otasp-failed";
+constexpr char kErrorOutOfRange[] = "out-of-range";
+constexpr char kErrorPinMissing[] = "pin-missing";
+constexpr char kErrorPppAuthFailed[] = "ppp-auth-failed";
+constexpr char kErrorSimLocked[] = "sim-locked";
+constexpr char kErrorNotRegistered[] = "not-registered";
+constexpr char kErrorTooManySTAs[] = "too-many-stas";
+constexpr char kErrorDisconnect[] = "disconnect-failure";
+constexpr char kErrorUnknownFailure[] = "unknown-failure";
// Flimflam error result codes.
-const char kErrorResultSuccess[] = "org.chromium.flimflam.Error.Success";
-const char kErrorResultFailure[] = "org.chromium.flimflam.Error.Failure";
-const char kErrorResultAlreadyConnected[] =
+constexpr char kErrorResultSuccess[] = "org.chromium.flimflam.Error.Success";
+constexpr char kErrorResultFailure[] = "org.chromium.flimflam.Error.Failure";
+constexpr char kErrorResultAlreadyConnected[] =
"org.chromium.flimflam.Error.AlreadyConnected";
-const char kErrorResultAlreadyExists[] =
+constexpr char kErrorResultAlreadyExists[] =
"org.chromium.flimflam.Error.AlreadyExists";
-const char kErrorResultIllegalOperation[] =
+constexpr char kErrorResultIllegalOperation[] =
"org.chromium.flimflam.Error.IllegalOperation";
-const char kErrorResultIncorrectPin[] =
+constexpr char kErrorResultIncorrectPin[] =
"org.chromium.flimflam.Error.IncorrectPin";
-const char kErrorResultInProgress[] = "org.chromium.flimflam.Error.InProgress";
-const char kErrorResultInternalError[] =
+constexpr char kErrorResultInProgress[] =
+ "org.chromium.flimflam.Error.InProgress";
+constexpr char kErrorResultInternalError[] =
"org.chromium.flimflam.Error.InternalError";
-const char kErrorResultInvalidApn[] = "org.chromium.flimflam.Error.InvalidApn";
-const char kErrorResultInvalidArguments[] =
+constexpr char kErrorResultInvalidApn[] =
+ "org.chromium.flimflam.Error.InvalidApn";
+constexpr char kErrorResultInvalidArguments[] =
"org.chromium.flimflam.Error.InvalidArguments";
-const char kErrorResultInvalidNetworkName[] =
+constexpr char kErrorResultInvalidNetworkName[] =
"org.chromium.flimflam.Error.InvalidNetworkName";
-const char kErrorResultInvalidPassphrase[] =
+constexpr char kErrorResultInvalidPassphrase[] =
"org.chromium.flimflam.Error.InvalidPassphrase";
-const char kErrorResultInvalidProperty[] =
+constexpr char kErrorResultInvalidProperty[] =
"org.chromium.flimflam.Error.InvalidProperty";
-const char kErrorResultNoCarrier[] = "org.chromium.flimflam.Error.NoCarrier";
-const char kErrorResultNotConnected[] =
+constexpr char kErrorResultNoCarrier[] =
+ "org.chromium.flimflam.Error.NoCarrier";
+constexpr char kErrorResultNotConnected[] =
"org.chromium.flimflam.Error.NotConnected";
-const char kErrorResultNotFound[] = "org.chromium.flimflam.Error.NotFound";
-const char kErrorResultNotImplemented[] =
+constexpr char kErrorResultNotFound[] = "org.chromium.flimflam.Error.NotFound";
+constexpr char kErrorResultNotImplemented[] =
"org.chromium.flimflam.Error.NotImplemented";
-const char kErrorResultNotOnHomeNetwork[] =
+constexpr char kErrorResultNotOnHomeNetwork[] =
"org.chromium.flimflam.Error.NotOnHomeNetwork";
-const char kErrorResultNotRegistered[] =
+constexpr char kErrorResultNotRegistered[] =
"org.chromium.flimflam.Error.NotRegistered";
-const char kErrorResultNotSupported[] =
+constexpr char kErrorResultNotSupported[] =
"org.chromium.flimflam.Error.NotSupported";
-const char kErrorResultOperationAborted[] =
+constexpr char kErrorResultOperationAborted[] =
"org.chromium.flimflam.Error.OperationAborted";
-const char kErrorResultOperationInitiated[] =
+constexpr char kErrorResultOperationInitiated[] =
"org.chromium.flimflam.Error.OperationInitiated";
-const char kErrorResultOperationTimeout[] =
+constexpr char kErrorResultOperationTimeout[] =
"org.chromium.flimflam.Error.OperationTimeout";
-const char kErrorResultPassphraseRequired[] =
+constexpr char kErrorResultPassphraseRequired[] =
"org.chromium.flimflam.Error.PassphraseRequired";
-const char kErrorResultPermissionDenied[] =
+constexpr char kErrorResultPermissionDenied[] =
"org.chromium.flimflam.Error.PermissionDenied";
-const char kErrorResultPinBlocked[] = "org.chromium.flimflam.Error.PinBlocked";
-const char kErrorResultPinRequired[] =
+constexpr char kErrorResultPinBlocked[] =
+ "org.chromium.flimflam.Error.PinBlocked";
+constexpr char kErrorResultPinRequired[] =
"org.chromium.flimflam.Error.PinRequired";
-const char kErrorResultTechnologyNotAvailable[] =
+constexpr char kErrorResultTechnologyNotAvailable[] =
"org.chromium.flimflam.Error.TechnologyNotAvailable";
-const char kErrorResultWepNotSupported[] =
+constexpr char kErrorResultWepNotSupported[] =
"org.chromium.flimflam.Error.WepNotSupported";
-const char kErrorResultWrongState[] = "org.chromium.flimflam.Error.WrongState";
+constexpr char kErrorResultWrongState[] =
+ "org.chromium.flimflam.Error.WrongState";
-const char kUnknownString[] = "UNKNOWN";
+constexpr char kUnknownString[] = "UNKNOWN";
// Device bus types.
-const char kDeviceBusTypePci[] = "pci";
-const char kDeviceBusTypeUsb[] = "usb";
+constexpr char kDeviceBusTypePci[] = "pci";
+constexpr char kDeviceBusTypeUsb[] = "usb";
// Technology types (augments "Flimflam type options" above).
-const char kTypeEthernetEap[] = "etherneteap";
-const char kTypeTunnel[] = "tunnel";
-const char kTypeLoopback[] = "loopback";
-const char kTypePPP[] = "ppp";
-const char kTypeGuestInterface[] = "guest_interface";
-const char kTypeUnknown[] = "unknown";
+constexpr char kTypeEthernetEap[] = "etherneteap";
+constexpr char kTypeTunnel[] = "tunnel";
+constexpr char kTypeLoopback[] = "loopback";
+constexpr char kTypePPP[] = "ppp";
+constexpr char kTypeGuestInterface[] = "guest_interface";
+constexpr char kTypeUnknown[] = "unknown";
// Error strings.
-const char kErrorEapAuthenticationFailed[] = "eap-authentication-failed";
-const char kErrorEapLocalTlsFailed[] = "eap-local-tls-failed";
-const char kErrorEapRemoteTlsFailed[] = "eap-remote-tls-failed";
+constexpr char kErrorEapAuthenticationFailed[] = "eap-authentication-failed";
+constexpr char kErrorEapLocalTlsFailed[] = "eap-local-tls-failed";
+constexpr char kErrorEapRemoteTlsFailed[] = "eap-remote-tls-failed";
// Subject alternative name match type property values as expected by
// wpa_supplicant.
-const char kEapSubjectAlternativeNameMatchTypeEmail[] = "EMAIL";
-const char kEapSubjectAlternativeNameMatchTypeDNS[] = "DNS";
-const char kEapSubjectAlternativeNameMatchTypeURI[] = "URI";
+constexpr char kEapSubjectAlternativeNameMatchTypeEmail[] = "EMAIL";
+constexpr char kEapSubjectAlternativeNameMatchTypeDNS[] = "DNS";
+constexpr char kEapSubjectAlternativeNameMatchTypeURI[] = "URI";
// WiFi Device kLinkStatisticsProperty sub-property names.
-const char kAverageReceiveSignalDbmProperty[] = "AverageReceiveSignalDbm";
-const char kByteReceiveSuccessesProperty[] = "ByteReceiveSuccesses";
-const char kByteTransmitSuccessesProperty[] = "ByteTransmitSuccesses";
-const char kInactiveTimeMillisecondsProperty[] = "InactiveTimeMilliseconds";
-const char kLastReceiveSignalDbmProperty[] = "LastReceiveSignalDbm";
-const char kPacketReceiveDropProperty[] = "PacketReceiveDrops";
-const char kPacketReceiveSuccessesProperty[] = "PacketReceiveSuccesses";
-const char kPacketTransmitFailuresProperty[] = "PacketTransmitFailures";
-const char kPacketTransmitSuccessesProperty[] = "PacketTransmitSuccesses";
-const char kReceiveBitrateProperty[] = "ReceiveBitrate";
-const char kTransmitBitrateProperty[] = "TransmitBitrate";
-const char kTransmitRetriesProperty[] = "TransmitRetries";
+constexpr char kAverageReceiveSignalDbmProperty[] = "AverageReceiveSignalDbm";
+constexpr char kByteReceiveSuccessesProperty[] = "ByteReceiveSuccesses";
+constexpr char kByteTransmitSuccessesProperty[] = "ByteTransmitSuccesses";
+constexpr char kInactiveTimeMillisecondsProperty[] = "InactiveTimeMilliseconds";
+constexpr char kLastReceiveSignalDbmProperty[] = "LastReceiveSignalDbm";
+constexpr char kPacketReceiveDropProperty[] = "PacketReceiveDrops";
+constexpr char kPacketReceiveSuccessesProperty[] = "PacketReceiveSuccesses";
+constexpr char kPacketTransmitFailuresProperty[] = "PacketTransmitFailures";
+constexpr char kPacketTransmitSuccessesProperty[] = "PacketTransmitSuccesses";
+constexpr char kReceiveBitrateProperty[] = "ReceiveBitrate";
+constexpr char kTransmitBitrateProperty[] = "TransmitBitrate";
+constexpr char kTransmitRetriesProperty[] = "TransmitRetries";
// Wake on WiFi features.
-const char kWakeOnWiFiFeaturesEnabledDarkConnect[] = "darkconnect";
-const char kWakeOnWiFiFeaturesEnabledNone[] = "none";
+constexpr char kWakeOnWiFiFeaturesEnabledDarkConnect[] = "darkconnect";
+constexpr char kWakeOnWiFiFeaturesEnabledNone[] = "none";
// Wake on WiFi wake reasons.
// These (except Unknown) will also be sent to powerd via
// RecordDarkResumeWakeReason, to tell it the reason of the current dark
// resume.
-const char kWakeOnWiFiReasonDisconnect[] = "WiFi.Disconnect";
-const char kWakeOnWiFiReasonPattern[] = "WiFi.Pattern";
-const char kWakeOnWiFiReasonSSID[] = "WiFi.SSID";
-const char kWakeOnWiFiReasonUnknown[] = "Unknown";
+constexpr char kWakeOnWiFiReasonDisconnect[] = "WiFi.Disconnect";
+constexpr char kWakeOnWiFiReasonPattern[] = "WiFi.Pattern";
+constexpr char kWakeOnWiFiReasonSSID[] = "WiFi.SSID";
+constexpr char kWakeOnWiFiReasonUnknown[] = "Unknown";
// kEapKeyMgmtProperty values.
-const char kKeyManagementIEEE8021X[] = "IEEE8021X";
+constexpr char kKeyManagementIEEE8021X[] = "IEEE8021X";
// Wake on WiFi Packet Type Constants.
-const char kWakeOnTCP[] = "TCP";
-const char kWakeOnUDP[] = "UDP";
-const char kWakeOnIDP[] = "IDP";
-const char kWakeOnIPIP[] = "IPIP";
-const char kWakeOnIGMP[] = "IGMP";
-const char kWakeOnICMP[] = "ICMP";
-const char kWakeOnIP[] = "IP";
+constexpr char kWakeOnTCP[] = "TCP";
+constexpr char kWakeOnUDP[] = "UDP";
+constexpr char kWakeOnIDP[] = "IDP";
+constexpr char kWakeOnIPIP[] = "IPIP";
+constexpr char kWakeOnIGMP[] = "IGMP";
+constexpr char kWakeOnICMP[] = "ICMP";
+constexpr char kWakeOnIP[] = "IP";
// ONC Source constants.
static constexpr char kONCSourceUnknown[] = "Unknown";
@@ -871,133 +896,135 @@
"NonPersistentRandom";
// Cellular activation types.
-const char kActivationTypeNonCellular[] = "NonCellular"; // For future use
-const char kActivationTypeOMADM[] = "OMADM"; // For future use
-const char kActivationTypeOTA[] = "OTA";
-const char kActivationTypeOTASP[] = "OTASP";
+constexpr char kActivationTypeNonCellular[] = "NonCellular"; // For future use
+constexpr char kActivationTypeOMADM[] = "OMADM"; // For future use
+constexpr char kActivationTypeOTA[] = "OTA";
+constexpr char kActivationTypeOTASP[] = "OTASP";
// USB Ethernet MAC address sources.
-const char kUsbEthernetMacAddressSourceDesignatedDockMac[] =
+constexpr char kUsbEthernetMacAddressSourceDesignatedDockMac[] =
"designated_dock_mac";
-const char kUsbEthernetMacAddressSourceBuiltinAdapterMac[] =
+constexpr char kUsbEthernetMacAddressSourceBuiltinAdapterMac[] =
"builtin_adapter_mac";
-const char kUsbEthernetMacAddressSourceUsbAdapterMac[] = "usb_adapter_mac";
+constexpr char kUsbEthernetMacAddressSourceUsbAdapterMac[] = "usb_adapter_mac";
// Geolocation property field names.
// Reference:
// https://devsite.googleplex.com/maps/documentation/business/geolocation/
// Top level properties for a Geolocation request.
-const char kGeoHomeMobileCountryCodeProperty[] = "homeMobileCountryCode";
-const char kGeoHomeMobileNetworkCodeProperty[] = "homeMobileNetworkCode";
-const char kGeoRadioTypePropertyProperty[] = "radioType";
-const char kGeoCellTowersProperty[] = "cellTowers";
-const char kGeoWifiAccessPointsProperty[] = "wifiAccessPoints";
+constexpr char kGeoHomeMobileCountryCodeProperty[] = "homeMobileCountryCode";
+constexpr char kGeoHomeMobileNetworkCodeProperty[] = "homeMobileNetworkCode";
+constexpr char kGeoRadioTypePropertyProperty[] = "radioType";
+constexpr char kGeoCellTowersProperty[] = "cellTowers";
+constexpr char kGeoWifiAccessPointsProperty[] = "wifiAccessPoints";
// Cell tower object property names.
-const char kGeoCellIdProperty[] = "cellId";
-const char kGeoLocationAreaCodeProperty[] = "locationAreaCode";
-const char kGeoMobileCountryCodeProperty[] = "mobileCountryCode";
-const char kGeoMobileNetworkCodeProperty[] = "mobileNetworkCode";
-const char kGeoTimingAdvanceProperty[] = "timingAdvance";
+constexpr char kGeoCellIdProperty[] = "cellId";
+constexpr char kGeoLocationAreaCodeProperty[] = "locationAreaCode";
+constexpr char kGeoMobileCountryCodeProperty[] = "mobileCountryCode";
+constexpr char kGeoMobileNetworkCodeProperty[] = "mobileNetworkCode";
+constexpr char kGeoTimingAdvanceProperty[] = "timingAdvance";
// WiFi access point property names.
-const char kGeoMacAddressProperty[] = "macAddress";
-const char kGeoChannelProperty[] = "channel";
-const char kGeoSignalToNoiseRatioProperty[] = "signalToNoiseRatio";
+constexpr char kGeoMacAddressProperty[] = "macAddress";
+constexpr char kGeoChannelProperty[] = "channel";
+constexpr char kGeoSignalToNoiseRatioProperty[] = "signalToNoiseRatio";
// Common property names for geolocation objects.
-const char kGeoAgeProperty[] = "age";
-const char kGeoSignalStrengthProperty[] = "signalStrength";
+constexpr char kGeoAgeProperty[] = "age";
+constexpr char kGeoSignalStrengthProperty[] = "signalStrength";
// ThirdPartyVpn parameters and constants.
-const char kAddressParameterThirdPartyVpn[] = "address";
-const char kBroadcastAddressParameterThirdPartyVpn[] = "broadcast_address";
-const char kGatewayParameterThirdPartyVpn[] = "gateway";
-const char kBypassTunnelForIpParameterThirdPartyVpn[] = "bypass_tunnel_for_ip";
-const char kSubnetPrefixParameterThirdPartyVpn[] = "subnet_prefix";
-const char kMtuParameterThirdPartyVpn[] = "mtu";
-const char kDomainSearchParameterThirdPartyVpn[] = "domain_search";
-const char kDnsServersParameterThirdPartyVpn[] = "dns_servers";
-const char kInclusionListParameterThirdPartyVpn[] = "inclusion_list";
-const char kExclusionListParameterThirdPartyVpn[] = "exclusion_list";
-const char kReconnectParameterThirdPartyVpn[] = "reconnect";
-const char kObjectPathBase[] = "/thirdpartyvpn/";
-const char kNonIPDelimiter = ':';
-const char kIPDelimiter = ' ';
+constexpr char kAddressParameterThirdPartyVpn[] = "address";
+constexpr char kBroadcastAddressParameterThirdPartyVpn[] = "broadcast_address";
+constexpr char kGatewayParameterThirdPartyVpn[] = "gateway";
+constexpr char kBypassTunnelForIpParameterThirdPartyVpn[] =
+ "bypass_tunnel_for_ip";
+constexpr char kSubnetPrefixParameterThirdPartyVpn[] = "subnet_prefix";
+constexpr char kMtuParameterThirdPartyVpn[] = "mtu";
+constexpr char kDomainSearchParameterThirdPartyVpn[] = "domain_search";
+constexpr char kDnsServersParameterThirdPartyVpn[] = "dns_servers";
+constexpr char kInclusionListParameterThirdPartyVpn[] = "inclusion_list";
+constexpr char kExclusionListParameterThirdPartyVpn[] = "exclusion_list";
+constexpr char kReconnectParameterThirdPartyVpn[] = "reconnect";
+constexpr char kObjectPathBase[] = "/thirdpartyvpn/";
+constexpr char kNonIPDelimiter = ':';
+constexpr char kIPDelimiter = ' ';
// Always-on VPN modes for the kAlwaysOnVpnModeProperty Profile property.
-const char kAlwaysOnVpnModeOff[] = "off";
-const char kAlwaysOnVpnModeBestEffort[] = "best-effort";
-const char kAlwaysOnVpnModeStrict[] = "strict";
+constexpr char kAlwaysOnVpnModeOff[] = "off";
+constexpr char kAlwaysOnVpnModeBestEffort[] = "best-effort";
+constexpr char kAlwaysOnVpnModeStrict[] = "strict";
// Possible traffic sources. Note that these sources should be kept in sync with
// the sources defined in TrafficCounter::Source at:
// src/platform2/system_api/dbus/patchpanel/patchpanel_service.proto
-const char kTrafficCounterSourceUnknown[] = "unknown";
-const char kTrafficCounterSourceChrome[] = "chrome";
-const char kTrafficCounterSourceUser[] = "user";
-const char kTrafficCounterSourceArc[] = "arc";
-const char kTrafficCounterSourceCrosvm[] = "crosvm";
-const char kTrafficCounterSourcePluginvm[] = "pluginvm";
-const char kTrafficCounterSourceUpdateEngine[] = "update_engine";
-const char kTrafficCounterSourceVpn[] = "vpn";
-const char kTrafficCounterSourceSystem[] = "system";
+constexpr char kTrafficCounterSourceUnknown[] = "unknown";
+constexpr char kTrafficCounterSourceChrome[] = "chrome";
+constexpr char kTrafficCounterSourceUser[] = "user";
+constexpr char kTrafficCounterSourceArc[] = "arc";
+constexpr char kTrafficCounterSourceCrosvm[] = "crosvm";
+constexpr char kTrafficCounterSourcePluginvm[] = "pluginvm";
+constexpr char kTrafficCounterSourceUpdateEngine[] = "update_engine";
+constexpr char kTrafficCounterSourceVpn[] = "vpn";
+constexpr char kTrafficCounterSourceSystem[] = "system";
// Manager kTetheringConfigProperty dictionary key names.
-const char kTetheringConfAutoDisableProperty[] = "auto_disable";
-const char kTetheringConfBandProperty[] = "band";
-const char kTetheringConfMARProperty[] = "randomize_mac_address";
-const char kTetheringConfPassphraseProperty[] = "passphrase";
-const char kTetheringConfSecurityProperty[] = "security";
-const char kTetheringConfSSIDProperty[] = "ssid";
-const char kTetheringConfUpstreamTechProperty[] = "upstream_technology";
+constexpr char kTetheringConfAutoDisableProperty[] = "auto_disable";
+constexpr char kTetheringConfBandProperty[] = "band";
+constexpr char kTetheringConfMARProperty[] = "randomize_mac_address";
+constexpr char kTetheringConfPassphraseProperty[] = "passphrase";
+constexpr char kTetheringConfSecurityProperty[] = "security";
+constexpr char kTetheringConfSSIDProperty[] = "ssid";
+constexpr char kTetheringConfUpstreamTechProperty[] = "upstream_technology";
// Manager kTetheringCapabilitiesProperty dictionary key names.
-const char kTetheringCapDownstreamProperty[] = "downstream_technologies";
-const char kTetheringCapSecurityProperty[] = "wifi_security_modes";
-const char kTetheringCapUpstreamProperty[] = "upstream_technologies";
+constexpr char kTetheringCapDownstreamProperty[] = "downstream_technologies";
+constexpr char kTetheringCapSecurityProperty[] = "wifi_security_modes";
+constexpr char kTetheringCapUpstreamProperty[] = "upstream_technologies";
// Manager kTetheringStatusProperty dictionary key names.
-const char kTetheringStatusClientHostnameProperty[] = "hostname";
-const char kTetheringStatusClientIPv4Property[] = "IPv4";
-const char kTetheringStatusClientIPv6Property[] = "IPv6";
-const char kTetheringStatusClientMACProperty[] = "MAC";
-const char kTetheringStatusClientsProperty[] = "active_clients";
-const char kTetheringStatusDownstreamTechProperty[] = "downstream_technology";
-const char kTetheringStatusIdleReasonProperty[] = "idle_reason";
-const char kTetheringStatusStateProperty[] = "state";
-const char kTetheringStatusUpstreamTechProperty[] = "upstream_technology";
-const char kTetheringStatusUpstreamServiceProperty[] = "upstream_service";
+constexpr char kTetheringStatusClientHostnameProperty[] = "hostname";
+constexpr char kTetheringStatusClientIPv4Property[] = "IPv4";
+constexpr char kTetheringStatusClientIPv6Property[] = "IPv6";
+constexpr char kTetheringStatusClientMACProperty[] = "MAC";
+constexpr char kTetheringStatusClientsProperty[] = "active_clients";
+constexpr char kTetheringStatusDownstreamTechProperty[] =
+ "downstream_technology";
+constexpr char kTetheringStatusIdleReasonProperty[] = "idle_reason";
+constexpr char kTetheringStatusStateProperty[] = "state";
+constexpr char kTetheringStatusUpstreamTechProperty[] = "upstream_technology";
+constexpr char kTetheringStatusUpstreamServiceProperty[] = "upstream_service";
// kTetheringStatusIdleReasonProperty values
-const char kTetheringIdleReasonClientStop[] = "client_stop";
-const char kTetheringIdleReasonError[] = "error";
-const char kTetheringIdleReasonInactive[] = "inactive";
-const char kTetheringIdleReasonInitialState[] = "initial_state";
-const char kTetheringIdleReasonSuspend[] = "suspend";
-const char kTetheringIdleReasonUpstreamDisconnect[] = "upstream_disconnect";
-const char kTetheringIdleReasonUserExit[] = "user_exit";
+constexpr char kTetheringIdleReasonClientStop[] = "client_stop";
+constexpr char kTetheringIdleReasonError[] = "error";
+constexpr char kTetheringIdleReasonInactive[] = "inactive";
+constexpr char kTetheringIdleReasonInitialState[] = "initial_state";
+constexpr char kTetheringIdleReasonSuspend[] = "suspend";
+constexpr char kTetheringIdleReasonUpstreamDisconnect[] = "upstream_disconnect";
+constexpr char kTetheringIdleReasonUserExit[] = "user_exit";
// kTetheringStatusStateProperty values
-const char kTetheringStateActive[] = "active";
-const char kTetheringStateIdle[] = "idle";
-const char kTetheringStateStarting[] = "starting";
-const char kTetheringStateStopping[] = "stopping";
+constexpr char kTetheringStateActive[] = "active";
+constexpr char kTetheringStateIdle[] = "idle";
+constexpr char kTetheringStateStarting[] = "starting";
+constexpr char kTetheringStateStopping[] = "stopping";
// SetTetheringEnabled result values
-const char kTetheringEnableResultDownstreamWiFiFailure[] =
+constexpr char kTetheringEnableResultDownstreamWiFiFailure[] =
"downstream_wifi_failure";
-const char kTetheringEnableResultFailure[] = "failure";
-const char kTetheringEnableResultInvalidProperties[] = "invalid_properties";
-const char kTetheringEnableResultNetworkSetupFailure[] =
+constexpr char kTetheringEnableResultFailure[] = "failure";
+constexpr char kTetheringEnableResultInvalidProperties[] = "invalid_properties";
+constexpr char kTetheringEnableResultNetworkSetupFailure[] =
"network_setup_failure";
-const char kTetheringEnableResultNotAllowed[] = "not_allowed";
-const char kTetheringEnableResultSuccess[] = "success";
-const char kTetheringEnableResultUpstreamFailure[] = "upstream_failure";
-const char kTetheringEnableResultUpstreamNotAvailable[] =
+constexpr char kTetheringEnableResultNotAllowed[] = "not_allowed";
+constexpr char kTetheringEnableResultSuccess[] = "success";
+constexpr char kTetheringEnableResultUpstreamFailure[] = "upstream_failure";
+constexpr char kTetheringEnableResultUpstreamNotAvailable[] =
"upstream_not_available";
-const char kTetheringEnableResultWrongState[] = "wrong_state";
+constexpr char kTetheringEnableResultWrongState[] = "wrong_state";
// kCheckTetheringReadinessFunction return status
-const char kTetheringReadinessNotAllowed[] = "not_allowed";
-const char kTetheringReadinessReady[] = "ready";
-const char kTetheringReadinessUpstreamNetworkNotAvailable[] =
+constexpr char kTetheringReadinessNotAllowed[] = "not_allowed";
+constexpr char kTetheringReadinessReady[] = "ready";
+constexpr char kTetheringReadinessUpstreamNetworkNotAvailable[] =
"upstream_network_not_available";
} // namespace shill
diff --git a/chroot/build/amd64-generic/usr/include/chromeos/patchpanel/net_util.h b/chroot/build/amd64-generic/usr/include/chromeos/patchpanel/net_util.h
index 9c6ed56..9bb7871 100644
--- a/chroot/build/amd64-generic/usr/include/chromeos/patchpanel/net_util.h
+++ b/chroot/build/amd64-generic/usr/include/chromeos/patchpanel/net_util.h
@@ -26,6 +26,7 @@
#include <base/strings/stringprintf.h>
#include <base/sys_byteorder.h>
#include <brillo/brillo_export.h>
+#include <net-base/ipv4_address.h>
#include "chromeos/patchpanel/mac_address_generator.h"
@@ -34,6 +35,12 @@
namespace patchpanel {
+// Returns the IPv4Address from the network-byte order uint32_t representation
+// of the IPv4 address.
+// TODO(b/279693340): Remove the function after all IPv4 address represented by
+// uint32_t are migrated to net_base::IPv4Address.
+net_base::IPv4Address ConvertUint32ToIPv4Address(uint32_t addr);
+
// Returns the network-byte order int32 representation of the IPv4 address given
// byte per byte, most significant bytes first.
BRILLO_EXPORT constexpr uint32_t Ipv4Addr(uint8_t b0,
diff --git a/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h b/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
index d6de77a..4000119 100644
--- a/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
+++ b/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
@@ -145,9 +145,10 @@
uint8_t blur_enabled : 1;
uint8_t replace_enabled : 1;
uint8_t relight_enabled : 1;
- uint8_t pad6_[1];
+ uint8_t light_intensity_$flag : 1;
+ uint8_t pad7_[1];
int32_t segmentation_model;
- uint8_t pad7_[4];
+ float light_intensity_$value;
mojo::internal::Pointer<::mojo_base::mojom::internal::RelativeFilePath_Data> background_filepath;
private:
diff --git a/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom-shared.h b/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom-shared.h
index 76668cd..b3ad816 100644
--- a/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom-shared.h
+++ b/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom-shared.h
@@ -261,6 +261,15 @@
return mojo::internal::Deserialize<::mojo_base::mojom::RelativeFilePathDataView>(
pointer, output, message_);
}
+ absl::optional<float> light_intensity() const {
+ if (data_->header_.version < 4) {
+ return absl::nullopt;
+ }
+
+ return data_->light_intensity_$flag
+ ? absl::make_optional(data_->light_intensity_$value)
+ : absl::nullopt;
+ }
private:
internal::EffectsConfig_Data* data_ = nullptr;
mojo::Message* message_ = nullptr;
@@ -406,6 +415,10 @@
in_background_filepath, background_filepath_fragment);
fragment->background_filepath.Set(
background_filepath_fragment.is_null() ? nullptr : background_filepath_fragment.data());
+ fragment->light_intensity_$flag = Traits::light_intensity(input).has_value();
+ if (Traits::light_intensity(input).has_value()) {
+ fragment->light_intensity_$value = Traits::light_intensity(input).value();
+ }
}
static bool Deserialize(::cros::mojom::internal::EffectsConfig_Data* input,
diff --git a/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom.h b/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom.h
index bee4305..d01e889 100644
--- a/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom.h
+++ b/chroot/build/amd64-generic/usr/include/cros-camera/mojo/camera/mojo/effects/effects_pipeline.mojom.h
@@ -108,6 +108,18 @@
SegmentationModel segmentation_model,
::mojo_base::mojom::RelativeFilePathPtr background_filepath);
+ EffectsConfig(
+ CameraEffect effect,
+ BlurLevel blur_level,
+ GpuApi segmentation_gpu_api,
+ uint16_t graph_max_frames_in_flight,
+ bool blur_enabled,
+ bool replace_enabled,
+ bool relight_enabled,
+ SegmentationModel segmentation_model,
+ ::mojo_base::mojom::RelativeFilePathPtr background_filepath,
+ absl::optional<float> light_intensity);
+
EffectsConfig(const EffectsConfig&) = delete;
EffectsConfig& operator=(const EffectsConfig&) = delete;
@@ -200,6 +212,8 @@
SegmentationModel segmentation_model;
::mojo_base::mojom::RelativeFilePathPtr background_filepath;
+
+ absl::optional<float> light_intensity;
// Serialise this struct into a trace.
void WriteIntoTrace(perfetto_libchrome::TracedValue traced_context) const;
@@ -241,7 +255,8 @@
mojo::Clone(replace_enabled),
mojo::Clone(relight_enabled),
mojo::Clone(segmentation_model),
- mojo::Clone(background_filepath)
+ mojo::Clone(background_filepath),
+ mojo::Clone(light_intensity)
);
}
@@ -265,6 +280,8 @@
return false;
if (!mojo::Equals(this->background_filepath, other_struct.background_filepath))
return false;
+ if (!mojo::Equals(this->light_intensity, other_struct.light_intensity))
+ return false;
return true;
}
@@ -306,6 +323,10 @@
return true;
if (rhs.background_filepath < lhs.background_filepath)
return false;
+ if (lhs.light_intensity < rhs.light_intensity)
+ return true;
+ if (rhs.light_intensity < lhs.light_intensity)
+ return false;
return false;
}
@@ -367,6 +388,11 @@
return input->background_filepath;
}
+ static decltype(::cros::mojom::EffectsConfig::light_intensity) light_intensity(
+ const ::cros::mojom::EffectsConfigPtr& input) {
+ return input->light_intensity;
+ }
+
static bool Read(::cros::mojom::EffectsConfig::DataView input, ::cros::mojom::EffectsConfigPtr* output);
};
diff --git a/chroot/build/amd64-generic/usr/include/libchrome/base/hash/md5_nacl.h b/chroot/build/amd64-generic/usr/include/libchrome/base/hash/md5_nacl.h
deleted file mode 100644
index b1832d9..0000000
--- a/chroot/build/amd64-generic/usr/include/libchrome/base/hash/md5_nacl.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2019 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_HASH_MD5_NACL_H_
-#define BASE_HASH_MD5_NACL_H_
-
-#include <stdint.h>
-
-namespace base {
-
-// The output of an MD5 operation.
-struct MD5Digest {
- uint8_t a[16];
-};
-
-// Used for storing intermediate data during an MD5 computation. Callers
-// should not access the data.
-typedef char MD5Context[88];
-
-} // namespace base
-
-#endif // BASE_HASH_MD5_NACL_H_
diff --git a/chroot/build/amd64-generic/usr/include/metrics/structured_events.h b/chroot/build/amd64-generic/usr/include/metrics/structured_events.h
index 600b439..72007ea 100644
--- a/chroot/build/amd64-generic/usr/include/metrics/structured_events.h
+++ b/chroot/build/amd64-generic/usr/include/metrics/structured_events.h
@@ -15,7 +15,7 @@
namespace structured {
namespace events {
-constexpr uint64_t kProjectNameHashes[] = {UINT64_C(9074739597929991885), UINT64_C(11181229631788078243), UINT64_C(1745381000935843040), UINT64_C(8206859287963243715), UINT64_C(11294265225635075664), UINT64_C(16881314472396226433), UINT64_C(10860358748803291132), UINT64_C(5876808001962504629), UINT64_C(17922303533051575891), UINT64_C(1370722622176744014), UINT64_C(4320592646346933548), UINT64_C(7302676440391025918), UINT64_C(4690103929823698613), UINT64_C(9675127341789951965)};
+constexpr uint64_t kProjectNameHashes[] = {UINT64_C(9074739597929991885), UINT64_C(11181229631788078243), UINT64_C(1745381000935843040), UINT64_C(8206859287963243715), UINT64_C(11294265225635075664), UINT64_C(16881314472396226433), UINT64_C(10860358748803291132), UINT64_C(5876808001962504629), UINT64_C(17922303533051575891), UINT64_C(1370722622176744014), UINT64_C(6962789877417678651), UINT64_C(4320592646346933548), UINT64_C(7302676440391025918), UINT64_C(4690103929823698613), UINT64_C(9675127341789951965)};
namespace bluetooth {
@@ -855,6 +855,55 @@
} // namespace usb_device
+namespace usb_session {
+
+class BRILLO_EXPORT UsbSessionEvent final : public ::metrics::structured::EventBase {
+ public:
+ UsbSessionEvent();
+ ~UsbSessionEvent() override;
+
+ static constexpr uint64_t kEventNameHash = UINT64_C(16939735174067274714);
+ static constexpr uint64_t kProjectNameHash = UINT64_C(6962789877417678651);
+ static constexpr IdType kIdType = IdType::kProjectId;
+ static constexpr StructuredEventProto_EventType kEventType =
+ StructuredEventProto_EventType_REGULAR;
+
+ static constexpr uint64_t kBootIdNameHash = UINT64_C(9983133050293312198);
+ UsbSessionEvent& SetBootId(const std::string& value);
+ std::string GetBootIdForTest() const;
+
+ static constexpr uint64_t kSystemTimeNameHash = UINT64_C(5430963162341175395);
+ UsbSessionEvent& SetSystemTime(const int64_t value);
+ int64_t GetSystemTimeForTest() const;
+
+ static constexpr uint64_t kActionNameHash = UINT64_C(21381969153622804);
+ UsbSessionEvent& SetAction(const int64_t value);
+ int64_t GetActionForTest() const;
+
+ static constexpr uint64_t kDeviceNumNameHash = UINT64_C(4313316212571108991);
+ UsbSessionEvent& SetDeviceNum(const int64_t value);
+ int64_t GetDeviceNumForTest() const;
+
+ static constexpr uint64_t kBusNumNameHash = UINT64_C(17302990436816966546);
+ UsbSessionEvent& SetBusNum(const int64_t value);
+ int64_t GetBusNumForTest() const;
+
+ static constexpr uint64_t kDepthNameHash = UINT64_C(7444545485412611639);
+ UsbSessionEvent& SetDepth(const int64_t value);
+ int64_t GetDepthForTest() const;
+
+ static constexpr uint64_t kVendorIdNameHash = UINT64_C(7982341394845147735);
+ UsbSessionEvent& SetVendorId(const int64_t value);
+ int64_t GetVendorIdForTest() const;
+
+ static constexpr uint64_t kProductIdNameHash = UINT64_C(3765840483194334735);
+ UsbSessionEvent& SetProductId(const int64_t value);
+ int64_t GetProductIdForTest() const;
+
+};
+
+} // namespace usb_session
+
namespace usb_error {
class BRILLO_EXPORT HubError final : public ::metrics::structured::EventBase {
diff --git a/chroot/build/amd64-generic/usr/include/pinweaver/pinweaver_eal.h b/chroot/build/amd64-generic/usr/include/pinweaver/pinweaver_eal.h
index c331394..59b5dbf 100644
--- a/chroot/build/amd64-generic/usr/include/pinweaver/pinweaver_eal.h
+++ b/chroot/build/amd64-generic/usr/include/pinweaver/pinweaver_eal.h
@@ -20,10 +20,6 @@
extern "C" {
#endif
-#ifndef BIOMETRICS_DEV
-#error BIOMETRICS_DEV needs to be defined.
-#endif
-
/* Implements memcpy_s on all platforms
*/
int pinweaver_eal_memcpy_s(
@@ -138,8 +134,6 @@
int pinweaver_eal_storage_set_tree_data(
const struct pw_long_term_storage_t *data);
-#if BIOMETRICS_DEV
-
/* Biometrics vendor functions. */
/*
@@ -167,8 +161,6 @@
void *secret, size_t *secret_size,
struct pw_ba_ecc_pt_t *ecc_pt_out);
-#endif
-
#ifdef __cplusplus
}
#endif
diff --git a/chroot/build/amd64-generic/usr/include/pinweaver/pinweaver_types.h b/chroot/build/amd64-generic/usr/include/pinweaver/pinweaver_types.h
index fcc6212..303d6bf 100644
--- a/chroot/build/amd64-generic/usr/include/pinweaver/pinweaver_types.h
+++ b/chroot/build/amd64-generic/usr/include/pinweaver/pinweaver_types.h
@@ -16,27 +16,15 @@
extern "C" {
#endif
-#ifndef BIOMETRICS_DEV
-#error BIOMETRICS_DEV needs to be defined.
-#endif
-
#define PW_PACKED __packed
-#if BIOMETRICS_DEV
#define PW_PROTOCOL_VERSION 2
-#else
-#define PW_PROTOCOL_VERSION 1
-#endif
#define PW_LEAF_MAJOR_VERSION 0
/* The change from version zero to one is the addition of valid_pcr_value
* metadata. The change from version one to two is the addition of the
* expiration timestamp.
*/
-#if BIOMETRICS_DEV
#define PW_LEAF_MINOR_VERSION 2
-#else
-#define PW_LEAF_MINOR_VERSION 1
-#endif
#define PW_MAX_MESSAGE_SIZE (2048 - 12 /* sizeof(struct tpm_cmd_header) */)
@@ -47,14 +35,10 @@
#define PW_ALIGN_TO_BLK __aligned(PW_WRAP_BLOCK_SIZE)
-#if BIOMETRICS_DEV
-
#define PW_BA_ECC_CORD_SIZE 32
#define PW_BA_PK_ENTRY_COUNT 2
-#endif
-
#define PW_HMAC_IV_SIZE_V1 4
#define PW_HMAC_IV_SIZE_V2 PW_WRAP_BLOCK_SIZE
@@ -80,7 +64,6 @@
PW_ERR_NV_VERSION_MISMATCH,
PW_ERR_PCR_NOT_MATCH,
PW_ERR_INTERNAL_FAILURE,
-#if BIOMETRICS_DEV
PW_ERR_EXPIRED,
PW_ERR_BIO_AUTH_CHANNEL_INVALID,
PW_ERR_BIO_AUTH_PUBLIC_KEY_VERSION_MISMATCH,
@@ -92,7 +75,6 @@
* when logging a try_auth event like this.
*/
PW_ERR_SUCCESS_WITH_INCREMENT,
-#endif
};
/* Represents the log2(fan out) of a tree. */
@@ -177,8 +159,6 @@
*/
#define PW_SECRET_SIZE 32
-#if BIOMETRICS_DEV
-
enum pw_leaf_type_enum {
PW_LEAF_TYPE_NORMAL,
PW_LEAF_TYPE_BIOMETRICS,
@@ -188,9 +168,6 @@
uint8_t v;
};
-#endif
-
-
struct PW_PACKED leaf_version_t {
/* minor comes first so this struct will be compatibile with uint32_t
* comparisons for little endian to make version comparisons easier.
@@ -232,13 +209,11 @@
struct attempt_count_t attempt_count;
struct valid_pcr_value_t valid_pcr_criteria[PW_MAX_PCR_CRITERIA_COUNT];
-#if BIOMETRICS_DEV
/* Timestamp when the leaf data expires. */
struct pw_timestamp_t expiration_ts;
/* Used to update expiration_ts after reset leaf */
struct time_diff_t expiration_delay_s;
struct pw_leaf_type_t leaf_type;
-#endif
};
/* Represents a struct of unknown length to be imported to process a request. */
@@ -266,8 +241,6 @@
uint8_t payload[];
};
-#if BIOMETRICS_DEV
-
/* Biometrics specific types. */
struct PW_PACKED pw_ba_pk_t {
@@ -284,8 +257,6 @@
struct pw_ba_ecc_pt_t pt;
};
-#endif
-
/******************************************************************************/
/* Message structs
*
@@ -305,7 +276,6 @@
PW_RESET_AUTH = 5,
PW_GET_LOG = 6,
PW_LOG_REPLAY = 7,
-#if BIOMETRICS_DEV
PW_SYS_INFO = 8,
/* The following are vendor specific pinweaver commands
* for biometrics feature.
@@ -313,7 +283,6 @@
PW_GENERATE_BA_PK = 9,
PW_START_BIO_AUTH = 10,
PW_BLOCK_GENERATE_BA_PK = 11,
-#endif
};
/* This enum is introduced because when we need a new variant in the log for
@@ -331,19 +300,13 @@
/* All the fields above correspond to the same kind of message with matching
* value in pw_message_type_enum.
*/
-#if BIOMETRICS_DEV
LOG_PW_TRY_AUTH02 = 5,
-#endif
LOG_PW_MT_INVALID = LOG_PW_MT_INVALID00,
LOG_PW_RESET_TREE = LOG_PW_RESET_TREE00,
LOG_PW_INSERT_LEAF = LOG_PW_INSERT_LEAF00,
LOG_PW_REMOVE_LEAF = LOG_PW_REMOVE_LEAF00,
-#if BIOMETRICS_DEV
LOG_PW_TRY_AUTH = LOG_PW_TRY_AUTH02,
-#else
- LOG_PW_TRY_AUTH = LOG_PW_TRY_AUTH00,
-#endif
};
struct PW_PACKED pw_message_type_t {
@@ -405,7 +368,6 @@
uint8_t path_hashes[][PW_HASH_SIZE];
};
-#if BIOMETRICS_DEV
struct PW_PACKED pw_request_insert_leaf02_t {
struct label_t label;
struct delay_schedule_entry_t delay_schedule[PW_SCHED_COUNT];
@@ -429,10 +391,6 @@
};
typedef struct pw_request_insert_leaf02_t pw_request_insert_leaf_t;
-#else
-typedef struct pw_request_insert_leaf01_t pw_request_insert_leaf_t;
-#endif
-
struct PW_PACKED pw_response_insert_leaf00_t {
struct unimported_leaf_data_t unimported_leaf_data;
@@ -487,7 +445,6 @@
struct unimported_leaf_data_t unimported_leaf_data;
};
-#if BIOMETRICS_DEV
struct PW_PACKED pw_request_reset_auth02_t {
uint8_t reset_secret[PW_SECRET_SIZE];
/* If strong_reset is non-zero, the expiration timestamp will be reset too. */
@@ -496,9 +453,6 @@
};
typedef struct pw_request_reset_auth02_t pw_request_reset_auth_t;
-#else
-typedef struct pw_request_reset_auth00_t pw_request_reset_auth_t;
-#endif
/* This is only used for parsing incoming data before version 02 */
struct PW_PACKED pw_response_reset_auth00_t {
@@ -506,16 +460,12 @@
struct unimported_leaf_data_t unimported_leaf_data;
};
-#if BIOMETRICS_DEV
struct PW_PACKED pw_response_reset_auth02_t {
/* Starting from protocol version 2, HEC isn't returned in reset_auth. */
struct unimported_leaf_data_t unimported_leaf_data;
};
typedef struct pw_response_reset_auth02_t pw_response_reset_auth_t;
-#else
-typedef struct pw_response_reset_auth00_t pw_response_reset_auth_t;
-#endif
struct PW_PACKED pw_request_get_log00_t {
/* The root on the CrOS side that needs to be brought back in sync with
@@ -571,14 +521,11 @@
* variant but used another variant type to distinguish whether this field
* exists.
*/
-#if BIOMETRICS_DEV
struct pw_timestamp_t expiration_ts;
-#endif
};
};
};
-#if BIOMETRICS_DEV
struct PW_PACKED pw_response_sys_info02_t {
struct pw_timestamp_t current_ts;
};
@@ -634,8 +581,6 @@
typedef struct pw_response_start_bio_auth02_t pw_response_start_bio_auth_t;
-#endif
-
struct PW_PACKED pw_request_t {
struct pw_request_header_t header;
union {
@@ -643,21 +588,15 @@
struct pw_request_reset_tree00_t reset_tree00;
struct pw_request_insert_leaf00_t insert_leaf00;
struct pw_request_insert_leaf01_t insert_leaf01;
-#if BIOMETRICS_DEV
struct pw_request_insert_leaf02_t insert_leaf02;
-#endif
struct pw_request_remove_leaf00_t remove_leaf00;
struct pw_request_try_auth00_t try_auth00;
struct pw_request_reset_auth00_t reset_auth00;
-#if BIOMETRICS_DEV
struct pw_request_reset_auth02_t reset_auth02;
-#endif
struct pw_request_get_log00_t get_log00;
struct pw_request_log_replay00_t log_replay00;
-#if BIOMETRICS_DEV
struct pw_request_generate_ba_pk02_t generate_pk02;
struct pw_request_start_bio_auth02_t start_bio_auth02;
-#endif
/* currently used types */
pw_request_reset_tree_t reset_tree;
@@ -667,10 +606,8 @@
pw_request_reset_auth_t reset_auth;
pw_request_get_log_t get_log;
pw_request_log_replay_t log_replay;
-#if BIOMETRICS_DEV
pw_request_generate_ba_pk_t generate_pk;
pw_request_start_bio_auth_t start_bio_auth;
-#endif
} data;
};
@@ -682,30 +619,24 @@
struct pw_response_try_auth00_t try_auth00;
struct pw_response_try_auth01_t try_auth01;
struct pw_response_reset_auth00_t reset_auth00;
-#if BIOMETRICS_DEV
struct pw_response_reset_auth02_t reset_auth02;
-#endif
/* An array with as many entries as are present in the log up to
* the present time or will fit in the message.
*/
uint8_t get_log[0];
struct pw_response_log_replay00_t log_replay00;
-#if BIOMETRICS_DEV
struct pw_response_sys_info02_t sys_info02;
struct pw_response_generate_ba_pk02_t generate_pk02;
struct pw_response_start_bio_auth02_t start_bio_auth02;
-#endif
/* currently used types */
pw_response_insert_leaf_t insert_leaf;
pw_response_try_auth_t try_auth;
pw_response_reset_auth_t reset_auth;
pw_response_log_replay_t log_replay;
-#if BIOMETRICS_DEV
pw_response_sys_info_t sys_info;
pw_response_generate_ba_pk_t generate_pk;
pw_response_start_bio_auth_t start_bio_auth;
-#endif
} data;
};
diff --git a/chroot/build/amd64-generic/usr/include/shill-client/shill/dbus-constants.h b/chroot/build/amd64-generic/usr/include/shill-client/shill/dbus-constants.h
index 8e3773e..7421238 100644
--- a/chroot/build/amd64-generic/usr/include/shill-client/shill/dbus-constants.h
+++ b/chroot/build/amd64-generic/usr/include/shill-client/shill/dbus-constants.h
@@ -8,851 +8,876 @@
// TODO(benchan): Reorganize shill constants and remove deprecated ones.
namespace shill {
// Flimflam D-Bus service identifiers.
-const char kFlimflamManagerInterface[] = "org.chromium.flimflam.Manager";
-const char kFlimflamServiceName[] = "org.chromium.flimflam";
-const char kFlimflamServicePath[] = "/"; // crosbug.com/20135
-const char kFlimflamServiceInterface[] = "org.chromium.flimflam.Service";
-const char kFlimflamIPConfigInterface[] = "org.chromium.flimflam.IPConfig";
-const char kFlimflamDeviceInterface[] = "org.chromium.flimflam.Device";
-const char kFlimflamProfileInterface[] = "org.chromium.flimflam.Profile";
-const char kFlimflamThirdPartyVpnInterface[] =
+constexpr char kFlimflamManagerInterface[] = "org.chromium.flimflam.Manager";
+constexpr char kFlimflamServiceName[] = "org.chromium.flimflam";
+constexpr char kFlimflamServicePath[] = "/"; // crosbug.com/20135
+constexpr char kFlimflamServiceInterface[] = "org.chromium.flimflam.Service";
+constexpr char kFlimflamIPConfigInterface[] = "org.chromium.flimflam.IPConfig";
+constexpr char kFlimflamDeviceInterface[] = "org.chromium.flimflam.Device";
+constexpr char kFlimflamProfileInterface[] = "org.chromium.flimflam.Profile";
+constexpr char kFlimflamThirdPartyVpnInterface[] =
"org.chromium.flimflam.ThirdPartyVpn";
// Common function names.
-const char kGetPropertiesFunction[] = "GetProperties";
-const char kSetPropertyFunction[] = "SetProperty";
-const char kClearPropertyFunction[] = "ClearProperty";
+constexpr char kGetPropertiesFunction[] = "GetProperties";
+constexpr char kSetPropertyFunction[] = "SetProperty";
+constexpr char kClearPropertyFunction[] = "ClearProperty";
// Manager function names.
-const char kConfigureServiceFunction[] = "ConfigureService";
-const char kConfigureServiceForProfileFunction[] = "ConfigureServiceForProfile";
-const char kScanAndConnectToBestServicesFunction[] =
+constexpr char kConfigureServiceFunction[] = "ConfigureService";
+constexpr char kConfigureServiceForProfileFunction[] =
+ "ConfigureServiceForProfile";
+constexpr char kScanAndConnectToBestServicesFunction[] =
"ScanAndConnectToBestServices";
-const char kCreateConnectivityReportFunction[] = "CreateConnectivityReport";
-const char kDisableTechnologyFunction[] = "DisableTechnology";
-const char kEnableTechnologyFunction[] = "EnableTechnology";
-const char kFindMatchingServiceFunction[] = "FindMatchingService";
-const char kGetNetworksForGeolocation[] = "GetNetworksForGeolocation";
-const char kGetServiceFunction[] = "GetService";
-const char kSetLOHSEnabledFunction[] = "SetLOHSEnabled";
-const char kRequestScanFunction[] = "RequestScan";
-const char kRequestWiFiRestartFunction[] = "RequestWiFiRestart";
-const char kSetNetworkThrottlingFunction[] = "SetNetworkThrottlingStatus";
-const char kSetDNSProxyDOHProvidersFunction[] = "SetDNSProxyDOHProviders";
-const char kAddPasspointCredentialsFunction[] = "AddPasspointCredentials";
-const char kRemovePasspointCredentialsFunction[] = "RemovePasspointCredentials";
-const char kSetTetheringEnabledFunction[] = "SetTetheringEnabled";
-const char kCheckTetheringReadinessFunction[] = "CheckTetheringReadiness";
+constexpr char kCreateConnectivityReportFunction[] = "CreateConnectivityReport";
+constexpr char kDisableTechnologyFunction[] = "DisableTechnology";
+constexpr char kEnableTechnologyFunction[] = "EnableTechnology";
+constexpr char kFindMatchingServiceFunction[] = "FindMatchingService";
+constexpr char kGetNetworksForGeolocation[] = "GetNetworksForGeolocation";
+constexpr char kGetServiceFunction[] = "GetService";
+constexpr char kSetLOHSEnabledFunction[] = "SetLOHSEnabled";
+constexpr char kRequestScanFunction[] = "RequestScan";
+constexpr char kRequestWiFiRestartFunction[] = "RequestWiFiRestart";
+constexpr char kSetNetworkThrottlingFunction[] = "SetNetworkThrottlingStatus";
+constexpr char kSetDNSProxyDOHProvidersFunction[] = "SetDNSProxyDOHProviders";
+constexpr char kAddPasspointCredentialsFunction[] = "AddPasspointCredentials";
+constexpr char kRemovePasspointCredentialsFunction[] =
+ "RemovePasspointCredentials";
+constexpr char kSetTetheringEnabledFunction[] = "SetTetheringEnabled";
+constexpr char kCheckTetheringReadinessFunction[] = "CheckTetheringReadiness";
// Service function names.
-const char kClearPropertiesFunction[] = "ClearProperties";
-const char kCompleteCellularActivationFunction[] = "CompleteCellularActivation";
-const char kConnectFunction[] = "Connect";
-const char kDisconnectFunction[] = "Disconnect";
-const char kGetLoadableProfileEntriesFunction[] = "GetLoadableProfileEntries";
-const char kGetWiFiPassphraseFunction[] = "GetWiFiPassphrase";
-const char kGetEapPassphraseFunction[] = "GetEapPassphrase";
-const char kRemoveServiceFunction[] = "Remove";
-const char kRequestPortalDetectionFunction[] = "RequestPortalDetection";
-const char kRequestTrafficCountersFunction[] = "RequestTrafficCounters";
-const char kResetTrafficCountersFunction[] = "ResetTrafficCounters";
-const char kSetPropertiesFunction[] = "SetProperties";
+constexpr char kClearPropertiesFunction[] = "ClearProperties";
+constexpr char kCompleteCellularActivationFunction[] =
+ "CompleteCellularActivation";
+constexpr char kConnectFunction[] = "Connect";
+constexpr char kDisconnectFunction[] = "Disconnect";
+constexpr char kGetLoadableProfileEntriesFunction[] =
+ "GetLoadableProfileEntries";
+constexpr char kGetWiFiPassphraseFunction[] = "GetWiFiPassphrase";
+constexpr char kGetEapPassphraseFunction[] = "GetEapPassphrase";
+constexpr char kRemoveServiceFunction[] = "Remove";
+constexpr char kRequestPortalDetectionFunction[] = "RequestPortalDetection";
+constexpr char kRequestTrafficCountersFunction[] = "RequestTrafficCounters";
+constexpr char kResetTrafficCountersFunction[] = "ResetTrafficCounters";
+constexpr char kSetPropertiesFunction[] = "SetProperties";
// IPConfig function names.
-const char kRemoveConfigFunction[] = "Remove";
+constexpr char kRemoveConfigFunction[] = "Remove";
// Device function names.
-const char kChangePinFunction[] = "ChangePin";
-const char kEnterPinFunction[] = "EnterPin";
-const char kRegisterFunction[] = "Register";
-const char kRequirePinFunction[] = "RequirePin";
-const char kResetFunction[] = "Reset";
-const char kSetUsbEthernetMacAddressSourceFunction[] =
+constexpr char kChangePinFunction[] = "ChangePin";
+constexpr char kEnterPinFunction[] = "EnterPin";
+constexpr char kRegisterFunction[] = "Register";
+constexpr char kRequirePinFunction[] = "RequirePin";
+constexpr char kResetFunction[] = "Reset";
+constexpr char kSetUsbEthernetMacAddressSourceFunction[] =
"SetUsbEthernetMacAddressSource";
-const char kUnblockPinFunction[] = "UnblockPin";
+constexpr char kUnblockPinFunction[] = "UnblockPin";
// Profile function names.
-const char kDeleteEntryFunction[] = "DeleteEntry";
-const char kGetEntryFunction[] = "GetEntry";
+constexpr char kDeleteEntryFunction[] = "DeleteEntry";
+constexpr char kGetEntryFunction[] = "GetEntry";
// ThirdPartyVpn function names.
-const char kOnPacketReceivedFunction[] = "OnPacketReceived";
-const char kOnPlatformMessageFunction[] = "OnPlatformMessage";
-const char kSetParametersFunction[] = "SetParameters";
-const char kSendPacketFunction[] = "SendPacket";
-const char kUpdateConnectionStateFunction[] = "UpdateConnectionState";
+constexpr char kOnPacketReceivedFunction[] = "OnPacketReceived";
+constexpr char kOnPlatformMessageFunction[] = "OnPlatformMessage";
+constexpr char kSetParametersFunction[] = "SetParameters";
+constexpr char kSendPacketFunction[] = "SendPacket";
+constexpr char kUpdateConnectionStateFunction[] = "UpdateConnectionState";
// Manager property names.
-const char kActiveProfileProperty[] = "ActiveProfile";
-const char kAlwaysOnVpnPackageProperty[] = "AlwaysOnVpnPackage";
-const char kAvailableTechnologiesProperty[] = "AvailableTechnologies";
-const char kClaimedDevicesProperty[] = "ClaimedDevices";
-const char kConnectedTechnologiesProperty[] = "ConnectedTechnologies";
-const char kConnectionStateProperty[] = "ConnectionState";
-const char kDefaultServiceProperty[] = "DefaultService";
-const char kDefaultTechnologyProperty[] = "DefaultTechnology";
-const char kDevicesProperty[] = "Devices";
-const char kDhcpPropertyHostnameProperty[] = "DHCPProperty.Hostname";
-const char kDisableWiFiVHTProperty[] = "DisableWiFiVHT";
-const char kDNSProxyDOHProvidersProperty[] = "DNSProxyDOHProviders";
-const char kEnabledTechnologiesProperty[] = "EnabledTechnologies";
-const char kEnableRFC8925Property[] = "EnableRFC8925";
-const char kLOHSConfigProperty[] = "LOHSConfig";
-const char kPortalFallbackHttpUrlsProperty[] = "PortalFallbackHttpUrls";
-const char kPortalFallbackHttpsUrlsProperty[] = "PortalFallbackHttpsUrls";
-const char kPortalHttpUrlProperty[] = "PortalHttpUrl";
-const char kPortalHttpsUrlProperty[] = "PortalHttpsUrl";
-const char kProfilesProperty[] = "Profiles";
-const char kServiceCompleteListProperty[] = "ServiceCompleteList";
-const char kServiceWatchListProperty[] = "ServiceWatchList";
-const char kServicesProperty[] = "Services"; // Also used for Profile.
-const char kSupportedVPNTypesProperty[] = "SupportedVPNTypes";
-const char kTetheringAllowedProperty[] = "TetheringAllowed";
-const char kTetheringCapabilitiesProperty[] = "TetheringCapabilities";
-const char kTetheringConfigProperty[] = "TetheringConfig";
-const char kTetheringStatusProperty[] = "TetheringStatus";
-const char kUninitializedTechnologiesProperty[] = "UninitializedTechnologies";
-const char kWakeOnLanEnabledProperty[] = "WakeOnLanEnabled";
-const char kWifiGlobalFTEnabledProperty[] = "WiFi.GlobalFTEnabled";
-const char kWifiScanAllowRoamProperty[] = "WiFi.ScanAllowRoam";
+constexpr char kActiveProfileProperty[] = "ActiveProfile";
+constexpr char kAlwaysOnVpnPackageProperty[] = "AlwaysOnVpnPackage";
+constexpr char kAvailableTechnologiesProperty[] = "AvailableTechnologies";
+constexpr char kClaimedDevicesProperty[] = "ClaimedDevices";
+constexpr char kConnectedTechnologiesProperty[] = "ConnectedTechnologies";
+constexpr char kConnectionStateProperty[] = "ConnectionState";
+constexpr char kDefaultServiceProperty[] = "DefaultService";
+constexpr char kDefaultTechnologyProperty[] = "DefaultTechnology";
+constexpr char kDevicesProperty[] = "Devices";
+constexpr char kDhcpPropertyHostnameProperty[] = "DHCPProperty.Hostname";
+constexpr char kDisableWiFiVHTProperty[] = "DisableWiFiVHT";
+constexpr char kDNSProxyDOHProvidersProperty[] = "DNSProxyDOHProviders";
+constexpr char kEnabledTechnologiesProperty[] = "EnabledTechnologies";
+constexpr char kEnableRFC8925Property[] = "EnableRFC8925";
+constexpr char kLOHSConfigProperty[] = "LOHSConfig";
+constexpr char kPortalFallbackHttpUrlsProperty[] = "PortalFallbackHttpUrls";
+constexpr char kPortalFallbackHttpsUrlsProperty[] = "PortalFallbackHttpsUrls";
+constexpr char kPortalHttpUrlProperty[] = "PortalHttpUrl";
+constexpr char kPortalHttpsUrlProperty[] = "PortalHttpsUrl";
+constexpr char kProfilesProperty[] = "Profiles";
+constexpr char kServiceCompleteListProperty[] = "ServiceCompleteList";
+constexpr char kServiceWatchListProperty[] = "ServiceWatchList";
+constexpr char kServicesProperty[] = "Services"; // Also used for Profile.
+constexpr char kSupportedVPNTypesProperty[] = "SupportedVPNTypes";
+constexpr char kTetheringAllowedProperty[] = "TetheringAllowed";
+constexpr char kTetheringCapabilitiesProperty[] = "TetheringCapabilities";
+constexpr char kTetheringConfigProperty[] = "TetheringConfig";
+constexpr char kTetheringStatusProperty[] = "TetheringStatus";
+constexpr char kUninitializedTechnologiesProperty[] =
+ "UninitializedTechnologies";
+constexpr char kWakeOnLanEnabledProperty[] = "WakeOnLanEnabled";
+constexpr char kWifiGlobalFTEnabledProperty[] = "WiFi.GlobalFTEnabled";
+constexpr char kWifiScanAllowRoamProperty[] = "WiFi.ScanAllowRoam";
// Manager and DefaultProfile property names (the Manager properties that are
// persisted by a DefaultProfile; these are always read-only for
// DefaultProfile).
-const char kArpGatewayProperty[] = "ArpGateway";
-const char kCheckPortalListProperty[] = "CheckPortalList";
-const char kIgnoredDNSSearchPathsProperty[] = "IgnoredDNSSearchPaths";
-const char kNoAutoConnectTechnologiesProperty[] = "NoAutoConnectTechnologies";
-const char kProhibitedTechnologiesProperty[] = "ProhibitedTechnologies";
+constexpr char kArpGatewayProperty[] = "ArpGateway";
+constexpr char kCheckPortalListProperty[] = "CheckPortalList";
+constexpr char kIgnoredDNSSearchPathsProperty[] = "IgnoredDNSSearchPaths";
+constexpr char kNoAutoConnectTechnologiesProperty[] =
+ "NoAutoConnectTechnologies";
+constexpr char kProhibitedTechnologiesProperty[] = "ProhibitedTechnologies";
// Base Service property names.
-const char kAutoConnectProperty[] = "AutoConnect";
-const char kCheckPortalProperty[] = "CheckPortal";
-const char kConnectableProperty[] = "Connectable";
-const char kDeviceProperty[] = "Device";
-const char kDiagnosticsDisconnectsProperty[] = "Diagnostics.Disconnects";
-const char kDiagnosticsMisconnectsProperty[] = "Diagnostics.Misconnects";
-const char kDnsAutoFallbackProperty[] = "DNSAutoFallback";
-const char kEapRemoteCertificationProperty[] = "EAP.RemoteCertification";
-const char kErrorDetailsProperty[] = "ErrorDetails";
-const char kErrorProperty[] = "Error";
-const char kGuidProperty[] = "GUID";
-const char kIPConfigProperty[] = "IPConfig";
-const char kIsConnectedProperty[] = "IsConnected";
-const char kLinkMonitorDisableProperty[] = "LinkMonitorDisable";
-const char kManagedCredentialsProperty[] = "ManagedCredentials";
-const char kMeteredProperty[] = "Metered";
-const char kNameProperty[] = "Name"; // Also used for Device and Profile.
-const char kPassphraseRequiredProperty[] = "PassphraseRequired";
-const char kPortalDetectionFailedPhaseProperty[] = "PortalDetectionFailedPhase";
-const char kPortalDetectionFailedStatusProperty[] =
+constexpr char kAutoConnectProperty[] = "AutoConnect";
+constexpr char kCheckPortalProperty[] = "CheckPortal";
+constexpr char kConnectableProperty[] = "Connectable";
+constexpr char kDeviceProperty[] = "Device";
+constexpr char kDiagnosticsDisconnectsProperty[] = "Diagnostics.Disconnects";
+constexpr char kDiagnosticsMisconnectsProperty[] = "Diagnostics.Misconnects";
+constexpr char kDnsAutoFallbackProperty[] = "DNSAutoFallback";
+constexpr char kEapRemoteCertificationProperty[] = "EAP.RemoteCertification";
+constexpr char kErrorDetailsProperty[] = "ErrorDetails";
+constexpr char kErrorProperty[] = "Error";
+constexpr char kGuidProperty[] = "GUID";
+constexpr char kIPConfigProperty[] = "IPConfig";
+constexpr char kIsConnectedProperty[] = "IsConnected";
+constexpr char kLinkMonitorDisableProperty[] = "LinkMonitorDisable";
+constexpr char kManagedCredentialsProperty[] = "ManagedCredentials";
+constexpr char kMeteredProperty[] = "Metered";
+constexpr char kNameProperty[] = "Name"; // Also used for Device and Profile.
+constexpr char kPassphraseRequiredProperty[] = "PassphraseRequired";
+constexpr char kPortalDetectionFailedPhaseProperty[] =
+ "PortalDetectionFailedPhase";
+constexpr char kPortalDetectionFailedStatusProperty[] =
"PortalDetectionFailedStatus";
-const char kPortalDetectionFailedStatusCodeProperty[] =
+constexpr char kPortalDetectionFailedStatusCodeProperty[] =
"PortalDetectionFailedStatusCode";
-const char kPreviousErrorProperty[] = "PreviousError";
-const char kPreviousErrorSerialNumberProperty[] = "PreviousErrorSerialNumber";
-const char kPriorityProperty[] = "Priority";
-const char kProbeUrlProperty[] = "ProbeUrl";
-const char kProfileProperty[] = "Profile";
-const char kProxyConfigProperty[] = "ProxyConfig";
-const char kSaveCredentialsProperty[] = "SaveCredentials";
-const char kSavedIPConfigProperty[] = "SavedIPConfig";
-const char kSignalStrengthProperty[] = "Strength";
-const char kStateProperty[] = "State";
-const char kStaticIPConfigProperty[] = "StaticIPConfig";
-const char kTrafficCounterResetTimeProperty[] = "TrafficCounterResetTime";
-const char kTypeProperty[] = "Type";
-const char kUIDataProperty[] = "UIData";
-const char kVisibleProperty[] = "Visible";
-const char kONCSourceProperty[] = "ONCSource";
-const char kUplinkSpeedPropertyKbps[] = "UplinkSpeedKbps";
-const char kDownlinkSpeedPropertyKbps[] = "DownlinkSpeedKbps";
+constexpr char kPreviousErrorProperty[] = "PreviousError";
+constexpr char kPreviousErrorSerialNumberProperty[] =
+ "PreviousErrorSerialNumber";
+constexpr char kPriorityProperty[] = "Priority";
+constexpr char kProbeUrlProperty[] = "ProbeUrl";
+constexpr char kProfileProperty[] = "Profile";
+constexpr char kProxyConfigProperty[] = "ProxyConfig";
+constexpr char kSaveCredentialsProperty[] = "SaveCredentials";
+constexpr char kSavedIPConfigProperty[] = "SavedIPConfig";
+constexpr char kSignalStrengthProperty[] = "Strength";
+constexpr char kStateProperty[] = "State";
+constexpr char kStaticIPConfigProperty[] = "StaticIPConfig";
+constexpr char kTrafficCounterResetTimeProperty[] = "TrafficCounterResetTime";
+constexpr char kTypeProperty[] = "Type";
+constexpr char kUIDataProperty[] = "UIData";
+constexpr char kVisibleProperty[] = "Visible";
+constexpr char kONCSourceProperty[] = "ONCSource";
+constexpr char kUplinkSpeedPropertyKbps[] = "UplinkSpeedKbps";
+constexpr char kDownlinkSpeedPropertyKbps[] = "DownlinkSpeedKbps";
// Cellular Service property names.
-const char kActivationStateProperty[] = "Cellular.ActivationState";
-const char kActivationTypeProperty[] = "Cellular.ActivationType";
-const char kCellularAllowRoamingProperty[] = "Cellular.AllowRoaming";
-const char kCellularApnProperty[] = "Cellular.APN";
-const char kCellularLastConnectedDefaultApnProperty[] =
+constexpr char kActivationStateProperty[] = "Cellular.ActivationState";
+constexpr char kActivationTypeProperty[] = "Cellular.ActivationType";
+constexpr char kCellularAllowRoamingProperty[] = "Cellular.AllowRoaming";
+constexpr char kCellularApnProperty[] = "Cellular.APN";
+constexpr char kCellularLastConnectedDefaultApnProperty[] =
"Cellular.LastConnectedDefaultApnProperty";
-const char kCellularLastConnectedAttachApnProperty[] =
+constexpr char kCellularLastConnectedAttachApnProperty[] =
"Cellular.LastConnectedAttachApnProperty";
-const char kCellularLastGoodApnProperty[] = "Cellular.LastGoodAPN";
-const char kCellularLastAttachApnProperty[] = "Cellular.LastAttachAPN";
-const char kCellularPPPPasswordProperty[] = "Cellular.PPP.Password";
-const char kCellularPPPUsernameProperty[] = "Cellular.PPP.Username";
+constexpr char kCellularLastGoodApnProperty[] = "Cellular.LastGoodAPN";
+constexpr char kCellularLastAttachApnProperty[] = "Cellular.LastAttachAPN";
+constexpr char kCellularPPPPasswordProperty[] = "Cellular.PPP.Password";
+constexpr char kCellularPPPUsernameProperty[] = "Cellular.PPP.Username";
// TODO(b/271332404): Remove kCellularUserApnListProperty when is no longer used
// in Chrome.
-const char kCellularUserApnListProperty[] = "Cellular.UserAPNList";
-const char kCellularCustomApnListProperty[] = "Cellular.CustomAPNList";
-const char kNetworkTechnologyProperty[] = "Cellular.NetworkTechnology";
-const char kOutOfCreditsProperty[] = "Cellular.OutOfCredits";
-const char kPaymentPortalProperty[] = "Cellular.Olp";
-const char kRoamingStateProperty[] = "Cellular.RoamingState";
-const char kServingOperatorProperty[] = "Cellular.ServingOperator";
-const char kTechnologyFamilyProperty[] = "Cellular.Family";
-const char kUsageURLProperty[] = "Cellular.UsageUrl";
+constexpr char kCellularUserApnListProperty[] = "Cellular.UserAPNList";
+constexpr char kCellularCustomApnListProperty[] = "Cellular.CustomAPNList";
+constexpr char kNetworkTechnologyProperty[] = "Cellular.NetworkTechnology";
+constexpr char kOutOfCreditsProperty[] = "Cellular.OutOfCredits";
+constexpr char kPaymentPortalProperty[] = "Cellular.Olp";
+constexpr char kRoamingStateProperty[] = "Cellular.RoamingState";
+constexpr char kServingOperatorProperty[] = "Cellular.ServingOperator";
+constexpr char kTechnologyFamilyProperty[] = "Cellular.Family";
+constexpr char kUsageURLProperty[] = "Cellular.UsageUrl";
// EAP Service/Passpoint credentials property names.
-const char kEapAnonymousIdentityProperty[] = "EAP.AnonymousIdentity";
-const char kEapCaCertIdProperty[] = "EAP.CACertID";
-const char kEapCaCertPemProperty[] = "EAP.CACertPEM";
-const char kEapCaCertProperty[] = "EAP.CACert";
-const char kEapCertIdProperty[] = "EAP.CertID";
-const char kEapDomainSuffixMatchProperty[] = "EAP.DomainSuffixMatch";
-const char kEapIdentityProperty[] = "EAP.Identity";
-const char kEapKeyIdProperty[] = "EAP.KeyID";
-const char kEapKeyMgmtProperty[] = "EAP.KeyMgmt";
-const char kEapMethodProperty[] = "EAP.EAP";
-const char kEapPasswordProperty[] = "EAP.Password";
-const char kEapPhase2AuthProperty[] = "EAP.InnerEAP";
-const char kEapPinProperty[] = "EAP.PIN";
-const char kEapSubjectAlternativeNameMatchProperty[] =
+constexpr char kEapAnonymousIdentityProperty[] = "EAP.AnonymousIdentity";
+constexpr char kEapCaCertIdProperty[] = "EAP.CACertID";
+constexpr char kEapCaCertPemProperty[] = "EAP.CACertPEM";
+constexpr char kEapCaCertProperty[] = "EAP.CACert";
+constexpr char kEapCertIdProperty[] = "EAP.CertID";
+constexpr char kEapDomainSuffixMatchProperty[] = "EAP.DomainSuffixMatch";
+constexpr char kEapIdentityProperty[] = "EAP.Identity";
+constexpr char kEapKeyIdProperty[] = "EAP.KeyID";
+constexpr char kEapKeyMgmtProperty[] = "EAP.KeyMgmt";
+constexpr char kEapMethodProperty[] = "EAP.EAP";
+constexpr char kEapPasswordProperty[] = "EAP.Password";
+constexpr char kEapPhase2AuthProperty[] = "EAP.InnerEAP";
+constexpr char kEapPinProperty[] = "EAP.PIN";
+constexpr char kEapSubjectAlternativeNameMatchProperty[] =
"EAP.SubjectAlternativeNameMatch";
-const char kEapSubjectMatchProperty[] = "EAP.SubjectMatch";
-const char kEapTLSVersionMaxProperty[] = "EAP.TLSVersionMax";
-const char kEapUseLoginPasswordProperty[] = "EAP.UseLoginPassword";
-const char kEapUseProactiveKeyCachingProperty[] = "EAP.UseProactiveKeyCaching";
-const char kEapUseSystemCasProperty[] = "EAP.UseSystemCAs";
-const char kEapSubjectAlternativeNameMatchTypeProperty[] = "Type";
-const char kEapSubjectAlternativeNameMatchValueProperty[] = "Value";
-const char kPasspointFQDNProperty[] = "Passpoint.FQDN";
-const char kPasspointProvisioningSourceProperty[] =
+constexpr char kEapSubjectMatchProperty[] = "EAP.SubjectMatch";
+constexpr char kEapTLSVersionMaxProperty[] = "EAP.TLSVersionMax";
+constexpr char kEapUseLoginPasswordProperty[] = "EAP.UseLoginPassword";
+constexpr char kEapUseProactiveKeyCachingProperty[] =
+ "EAP.UseProactiveKeyCaching";
+constexpr char kEapUseSystemCasProperty[] = "EAP.UseSystemCAs";
+constexpr char kEapSubjectAlternativeNameMatchTypeProperty[] = "Type";
+constexpr char kEapSubjectAlternativeNameMatchValueProperty[] = "Value";
+constexpr char kPasspointFQDNProperty[] = "Passpoint.FQDN";
+constexpr char kPasspointProvisioningSourceProperty[] =
"Passpoint.ProvisioningSource";
-const char kPasspointMatchTypeProperty[] = "Passpoint.MatchType";
-const char kPasspointIDProperty[] = "Passpoint.ID";
+constexpr char kPasspointMatchTypeProperty[] = "Passpoint.MatchType";
+constexpr char kPasspointIDProperty[] = "Passpoint.ID";
// WiFi Service property names.
-const char kCountryProperty[] = "Country";
-const char kModeProperty[] = "Mode";
-const char kPassphraseProperty[] = "Passphrase";
-const char kSecurityClassProperty[] = "SecurityClass";
-const char kSecurityProperty[] = "Security";
-const char kSSIDProperty[] = "SSID";
-const char kWifiBSsid[] = "WiFi.BSSID";
-const char kWifiFrequencyListProperty[] = "WiFi.FrequencyList";
-const char kWifiFrequency[] = "WiFi.Frequency";
-const char kWifiHexSsid[] = "WiFi.HexSSID";
-const char kWifiHiddenSsid[] = "WiFi.HiddenSSID";
-const char kWifiPhyMode[] = "WiFi.PhyMode";
+constexpr char kCountryProperty[] = "Country";
+constexpr char kModeProperty[] = "Mode";
+constexpr char kPassphraseProperty[] = "Passphrase";
+constexpr char kSecurityClassProperty[] = "SecurityClass";
+constexpr char kSecurityProperty[] = "Security";
+constexpr char kSSIDProperty[] = "SSID";
+constexpr char kWifiBSsid[] = "WiFi.BSSID";
+constexpr char kWifiFrequencyListProperty[] = "WiFi.FrequencyList";
+constexpr char kWifiFrequency[] = "WiFi.Frequency";
+constexpr char kWifiHexSsid[] = "WiFi.HexSSID";
+constexpr char kWifiHiddenSsid[] = "WiFi.HiddenSSID";
+constexpr char kWifiPhyMode[] = "WiFi.PhyMode";
static constexpr char kWifiRandomMACPolicy[] = "WiFi.RandomMACPolicy";
-const char kWifiRekeyInProgressProperty[] = "WiFi.RekeyInProgress";
-const char kWifiRoamStateProperty[] = "WiFi.RoamState";
-const char kWifiVendorInformationProperty[] = "WiFi.VendorInformation";
-const char kWifiSignalStrengthRssiProperty[] = "WiFi.SignalStrengthRssi";
-const char kWifiBSSIDAllowlist[] = "WiFi.BSSIDAllowlist";
+constexpr char kWifiRekeyInProgressProperty[] = "WiFi.RekeyInProgress";
+constexpr char kWifiRoamStateProperty[] = "WiFi.RoamState";
+constexpr char kWifiVendorInformationProperty[] = "WiFi.VendorInformation";
+constexpr char kWifiSignalStrengthRssiProperty[] = "WiFi.SignalStrengthRssi";
+constexpr char kWifiBSSIDAllowlist[] = "WiFi.BSSIDAllowlist";
// Base VPN Service property names.
-const char kHostProperty[] = "Host";
-const char kPhysicalTechnologyProperty[] = "PhysicalTechnology";
-const char kProviderProperty[] = "Provider";
-const char kProviderHostProperty[] = "Provider.Host";
-const char kProviderTypeProperty[] = "Provider.Type";
+constexpr char kHostProperty[] = "Host";
+constexpr char kPhysicalTechnologyProperty[] = "PhysicalTechnology";
+constexpr char kProviderProperty[] = "Provider";
+constexpr char kProviderHostProperty[] = "Provider.Host";
+constexpr char kProviderTypeProperty[] = "Provider.Type";
// ArcVpn Service property names.
-const char kArcVpnTunnelChromeProperty[] = "ArcVpn.TunnelChrome";
+constexpr char kArcVpnTunnelChromeProperty[] = "ArcVpn.TunnelChrome";
// IKEv2 VPN Service property names.
-const char kIKEv2AuthenticationTypeProperty[] = "IKEv2.AuthenticationType";
-const char kIKEv2CaCertPemProperty[] = "IKEv2.CACertPEM";
-const char kIKEv2ClientCertIdProperty[] = "IKEv2.ClientCertID";
-const char kIKEv2ClientCertSlotProperty[] = "IKEv2.ClientCertSlot";
-const char kIKEv2LocalIdentityProperty[] = "IKEv2.LocalIdentity";
-const char kIKEv2PskProperty[] = "IKEv2.PSK";
-const char kIKEv2RemoteIdentityProperty[] = "IKEv2.RemoteIdentity";
+constexpr char kIKEv2AuthenticationTypeProperty[] = "IKEv2.AuthenticationType";
+constexpr char kIKEv2CaCertPemProperty[] = "IKEv2.CACertPEM";
+constexpr char kIKEv2ClientCertIdProperty[] = "IKEv2.ClientCertID";
+constexpr char kIKEv2ClientCertSlotProperty[] = "IKEv2.ClientCertSlot";
+constexpr char kIKEv2LocalIdentityProperty[] = "IKEv2.LocalIdentity";
+constexpr char kIKEv2PskProperty[] = "IKEv2.PSK";
+constexpr char kIKEv2RemoteIdentityProperty[] = "IKEv2.RemoteIdentity";
// Values used in IKEv2.AuthenticationType.
-const char kIKEv2AuthenticationTypePSK[] = "PSK";
-const char kIKEv2AuthenticationTypeEAP[] = "EAP";
-const char kIKEv2AuthenticationTypeCert[] = "Cert";
+constexpr char kIKEv2AuthenticationTypePSK[] = "PSK";
+constexpr char kIKEv2AuthenticationTypeEAP[] = "EAP";
+constexpr char kIKEv2AuthenticationTypeCert[] = "Cert";
// L2TPIPsec Service property names.
-const char kL2TPIPsecCaCertPemProperty[] = "L2TPIPsec.CACertPEM";
-const char kL2TPIPsecClientCertIdProperty[] = "L2TPIPsec.ClientCertID";
-const char kL2TPIPsecClientCertSlotProperty[] = "L2TPIPsec.ClientCertSlot";
-const char kL2TPIPsecLcpEchoDisabledProperty[] = "L2TPIPsec.LCPEchoDisabled";
-const char kL2TPIPsecPasswordProperty[] = "L2TPIPsec.Password";
-const char kL2TPIPsecPinProperty[] = "L2TPIPsec.PIN";
-const char kL2TPIPsecPskProperty[] = "L2TPIPsec.PSK";
-const char kL2TPIPsecPskRequiredProperty[] = "L2TPIPsec.PSKRequired";
-const char kL2TPIPsecTunnelGroupProperty[] = "L2TPIPsec.TunnelGroup";
-const char kL2TPIPsecUseLoginPasswordProperty[] = "L2TPIPsec.UseLoginPassword";
-const char kL2TPIPsecUserProperty[] = "L2TPIPsec.User";
-const char kL2TPIPsecXauthPasswordProperty[] = "L2TPIPsec.XauthPassword";
-const char kL2TPIPsecXauthUserProperty[] = "L2TPIPsec.XauthUser";
+constexpr char kL2TPIPsecCaCertPemProperty[] = "L2TPIPsec.CACertPEM";
+constexpr char kL2TPIPsecClientCertIdProperty[] = "L2TPIPsec.ClientCertID";
+constexpr char kL2TPIPsecClientCertSlotProperty[] = "L2TPIPsec.ClientCertSlot";
+constexpr char kL2TPIPsecLcpEchoDisabledProperty[] =
+ "L2TPIPsec.LCPEchoDisabled";
+constexpr char kL2TPIPsecPasswordProperty[] = "L2TPIPsec.Password";
+constexpr char kL2TPIPsecPinProperty[] = "L2TPIPsec.PIN";
+constexpr char kL2TPIPsecPskProperty[] = "L2TPIPsec.PSK";
+constexpr char kL2TPIPsecPskRequiredProperty[] = "L2TPIPsec.PSKRequired";
+constexpr char kL2TPIPsecTunnelGroupProperty[] = "L2TPIPsec.TunnelGroup";
+constexpr char kL2TPIPsecUseLoginPasswordProperty[] =
+ "L2TPIPsec.UseLoginPassword";
+constexpr char kL2TPIPsecUserProperty[] = "L2TPIPsec.User";
+constexpr char kL2TPIPsecXauthPasswordProperty[] = "L2TPIPsec.XauthPassword";
+constexpr char kL2TPIPsecXauthUserProperty[] = "L2TPIPsec.XauthUser";
// OpenVPN Service property names.
-const char kOpenVPNAuthNoCacheProperty[] = "OpenVPN.AuthNoCache";
-const char kOpenVPNAuthProperty[] = "OpenVPN.Auth";
-const char kOpenVPNAuthRetryProperty[] = "OpenVPN.AuthRetry";
-const char kOpenVPNAuthUserPassProperty[] = "OpenVPN.AuthUserPass";
-const char kOpenVPNCaCertPemProperty[] = "OpenVPN.CACertPEM";
-const char kOpenVPNCipherProperty[] = "OpenVPN.Cipher";
-const char kOpenVPNClientCertIdProperty[] = "OpenVPN.Pkcs11.ID";
-const char kOpenVPNCompLZOProperty[] = "OpenVPN.CompLZO";
-const char kOpenVPNCompNoAdaptProperty[] = "OpenVPN.CompNoAdapt";
-const char kOpenVPNCompressProperty[] = "OpenVPN.Compress";
-const char kOpenVPNExtraCertPemProperty[] = "OpenVPN.ExtraCertPEM";
-const char kOpenVPNExtraHostsProperty[] = "OpenVPN.ExtraHosts";
-const char kOpenVPNIgnoreDefaultRouteProperty[] = "OpenVPN.IgnoreDefaultRoute";
-const char kOpenVPNKeyDirectionProperty[] = "OpenVPN.KeyDirection";
-const char kOpenVPNNsCertTypeProperty[] = "OpenVPN.NsCertType";
-const char kOpenVPNOTPProperty[] = "OpenVPN.OTP";
-const char kOpenVPNPasswordProperty[] = "OpenVPN.Password";
-const char kOpenVPNPinProperty[] = "OpenVPN.Pkcs11.PIN";
-const char kOpenVPNPingExitProperty[] = "OpenVPN.PingExit";
-const char kOpenVPNPingProperty[] = "OpenVPN.Ping";
-const char kOpenVPNPingRestartProperty[] = "OpenVPN.PingRestart";
-const char kOpenVPNPortProperty[] = "OpenVPN.Port";
-const char kOpenVPNProtoProperty[] = "OpenVPN.Proto";
-const char kOpenVPNPushPeerInfoProperty[] = "OpenVPN.PushPeerInfo";
-const char kOpenVPNRemoteCertEKUProperty[] = "OpenVPN.RemoteCertEKU";
-const char kOpenVPNRemoteCertKUProperty[] = "OpenVPN.RemoteCertKU";
-const char kOpenVPNRemoteCertTLSProperty[] = "OpenVPN.RemoteCertTLS";
-const char kOpenVPNRenegSecProperty[] = "OpenVPN.RenegSec";
-const char kOpenVPNServerPollTimeoutProperty[] = "OpenVPN.ServerPollTimeout";
-const char kOpenVPNShaperProperty[] = "OpenVPN.Shaper";
-const char kOpenVPNStaticChallengeProperty[] = "OpenVPN.StaticChallenge";
-const char kOpenVPNTLSAuthContentsProperty[] = "OpenVPN.TLSAuthContents";
-const char kOpenVPNTLSAuthProperty[] = "OpenVPN.TLSAuth";
-const char kOpenVPNTLSRemoteProperty[] = "OpenVPN.TLSRemote";
-const char kOpenVPNTLSVersionMinProperty[] = "OpenVPN.TLSVersionMin";
-const char kOpenVPNTokenProperty[] = "OpenVPN.Token";
-const char kOpenVPNUserProperty[] = "OpenVPN.User";
-const char kOpenVPNVerbProperty[] = "OpenVPN.Verb";
-const char kOpenVPNVerifyHashProperty[] = "OpenVPN.VerifyHash";
-const char kOpenVPNVerifyX509NameProperty[] = "OpenVPN.VerifyX509Name";
-const char kOpenVPNVerifyX509TypeProperty[] = "OpenVPN.VerifyX509Type";
-const char kVPNMTUProperty[] = "VPN.MTU";
+constexpr char kOpenVPNAuthNoCacheProperty[] = "OpenVPN.AuthNoCache";
+constexpr char kOpenVPNAuthProperty[] = "OpenVPN.Auth";
+constexpr char kOpenVPNAuthRetryProperty[] = "OpenVPN.AuthRetry";
+constexpr char kOpenVPNAuthUserPassProperty[] = "OpenVPN.AuthUserPass";
+constexpr char kOpenVPNCaCertPemProperty[] = "OpenVPN.CACertPEM";
+constexpr char kOpenVPNCipherProperty[] = "OpenVPN.Cipher";
+constexpr char kOpenVPNClientCertIdProperty[] = "OpenVPN.Pkcs11.ID";
+constexpr char kOpenVPNCompLZOProperty[] = "OpenVPN.CompLZO";
+constexpr char kOpenVPNCompNoAdaptProperty[] = "OpenVPN.CompNoAdapt";
+constexpr char kOpenVPNCompressProperty[] = "OpenVPN.Compress";
+constexpr char kOpenVPNExtraCertPemProperty[] = "OpenVPN.ExtraCertPEM";
+constexpr char kOpenVPNExtraHostsProperty[] = "OpenVPN.ExtraHosts";
+constexpr char kOpenVPNIgnoreDefaultRouteProperty[] =
+ "OpenVPN.IgnoreDefaultRoute";
+constexpr char kOpenVPNKeyDirectionProperty[] = "OpenVPN.KeyDirection";
+constexpr char kOpenVPNNsCertTypeProperty[] = "OpenVPN.NsCertType";
+constexpr char kOpenVPNOTPProperty[] = "OpenVPN.OTP";
+constexpr char kOpenVPNPasswordProperty[] = "OpenVPN.Password";
+constexpr char kOpenVPNPinProperty[] = "OpenVPN.Pkcs11.PIN";
+constexpr char kOpenVPNPingExitProperty[] = "OpenVPN.PingExit";
+constexpr char kOpenVPNPingProperty[] = "OpenVPN.Ping";
+constexpr char kOpenVPNPingRestartProperty[] = "OpenVPN.PingRestart";
+constexpr char kOpenVPNPortProperty[] = "OpenVPN.Port";
+constexpr char kOpenVPNProtoProperty[] = "OpenVPN.Proto";
+constexpr char kOpenVPNPushPeerInfoProperty[] = "OpenVPN.PushPeerInfo";
+constexpr char kOpenVPNRemoteCertEKUProperty[] = "OpenVPN.RemoteCertEKU";
+constexpr char kOpenVPNRemoteCertKUProperty[] = "OpenVPN.RemoteCertKU";
+constexpr char kOpenVPNRemoteCertTLSProperty[] = "OpenVPN.RemoteCertTLS";
+constexpr char kOpenVPNRenegSecProperty[] = "OpenVPN.RenegSec";
+constexpr char kOpenVPNServerPollTimeoutProperty[] =
+ "OpenVPN.ServerPollTimeout";
+constexpr char kOpenVPNShaperProperty[] = "OpenVPN.Shaper";
+constexpr char kOpenVPNStaticChallengeProperty[] = "OpenVPN.StaticChallenge";
+constexpr char kOpenVPNTLSAuthContentsProperty[] = "OpenVPN.TLSAuthContents";
+constexpr char kOpenVPNTLSAuthProperty[] = "OpenVPN.TLSAuth";
+constexpr char kOpenVPNTLSRemoteProperty[] = "OpenVPN.TLSRemote";
+constexpr char kOpenVPNTLSVersionMinProperty[] = "OpenVPN.TLSVersionMin";
+constexpr char kOpenVPNTokenProperty[] = "OpenVPN.Token";
+constexpr char kOpenVPNUserProperty[] = "OpenVPN.User";
+constexpr char kOpenVPNVerbProperty[] = "OpenVPN.Verb";
+constexpr char kOpenVPNVerifyHashProperty[] = "OpenVPN.VerifyHash";
+constexpr char kOpenVPNVerifyX509NameProperty[] = "OpenVPN.VerifyX509Name";
+constexpr char kOpenVPNVerifyX509TypeProperty[] = "OpenVPN.VerifyX509Type";
+constexpr char kVPNMTUProperty[] = "VPN.MTU";
// ThirdPartyVpn Service property names.
-const char kConfigurationNameProperty[] = "ConfigurationName";
-const char kExtensionNameProperty[] = "ExtensionName";
-const char kObjectPathSuffixProperty[] = "ObjectPathSuffix";
+constexpr char kConfigurationNameProperty[] = "ConfigurationName";
+constexpr char kExtensionNameProperty[] = "ExtensionName";
+constexpr char kObjectPathSuffixProperty[] = "ObjectPathSuffix";
// WireGuard Service property names.
-const char kWireGuardIPAddress[] = "WireGuard.IPAddress";
-const char kWireGuardPrivateKey[] = "WireGuard.PrivateKey";
-const char kWireGuardPublicKey[] = "WireGuard.PublicKey";
-const char kWireGuardPeers[] = "WireGuard.Peers";
+constexpr char kWireGuardIPAddress[] = "WireGuard.IPAddress";
+constexpr char kWireGuardPrivateKey[] = "WireGuard.PrivateKey";
+constexpr char kWireGuardPublicKey[] = "WireGuard.PublicKey";
+constexpr char kWireGuardPeers[] = "WireGuard.Peers";
// Property names of a peer in "WireGuard.Peers"
-const char kWireGuardPeerPublicKey[] = "PublicKey";
-const char kWireGuardPeerPresharedKey[] = "PresharedKey";
-const char kWireGuardPeerEndpoint[] = "Endpoint";
-const char kWireGuardPeerAllowedIPs[] = "AllowedIPs";
-const char kWireGuardPeerPersistentKeepalive[] = "PersistentKeepalive";
+constexpr char kWireGuardPeerPublicKey[] = "PublicKey";
+constexpr char kWireGuardPeerPresharedKey[] = "PresharedKey";
+constexpr char kWireGuardPeerEndpoint[] = "Endpoint";
+constexpr char kWireGuardPeerAllowedIPs[] = "AllowedIPs";
+constexpr char kWireGuardPeerPersistentKeepalive[] = "PersistentKeepalive";
// IPConfig property names.
// kAddressProperty: Defined below for Device.
-const char kBroadcastProperty[] = "Broadcast";
-const char kDomainNameProperty[] = "DomainName";
-const char kExcludedRoutesProperty[] = "ExcludedRoutes";
-const char kGatewayProperty[] = "Gateway";
-const char kIncludedRoutesProperty[] = "IncludedRoutes";
-const char kLeaseDurationSecondsProperty[] = "LeaseDurationSeconds";
-const char kMethodProperty[] = "Method";
-const char kMtuProperty[] = "Mtu";
-const char kNameServersProperty[] = "NameServers";
-const char kPeerAddressProperty[] = "PeerAddress";
-const char kPrefixlenProperty[] = "Prefixlen";
-const char kSearchDomainsProperty[] = "SearchDomains";
-const char kVendorEncapsulatedOptionsProperty[] = "VendorEncapsulatedOptions";
-const char kWebProxyAutoDiscoveryUrlProperty[] = "WebProxyAutoDiscoveryUrl";
-const char kiSNSOptionDataProperty[] = "iSNSOptionData"; // For RFC 4174.
+constexpr char kBroadcastProperty[] = "Broadcast";
+constexpr char kDomainNameProperty[] = "DomainName";
+constexpr char kExcludedRoutesProperty[] = "ExcludedRoutes";
+constexpr char kGatewayProperty[] = "Gateway";
+constexpr char kIncludedRoutesProperty[] = "IncludedRoutes";
+constexpr char kLeaseDurationSecondsProperty[] = "LeaseDurationSeconds";
+constexpr char kMethodProperty[] = "Method";
+constexpr char kMtuProperty[] = "Mtu";
+constexpr char kNameServersProperty[] = "NameServers";
+constexpr char kPeerAddressProperty[] = "PeerAddress";
+constexpr char kPrefixlenProperty[] = "Prefixlen";
+constexpr char kSearchDomainsProperty[] = "SearchDomains";
+constexpr char kVendorEncapsulatedOptionsProperty[] =
+ "VendorEncapsulatedOptions";
+constexpr char kWebProxyAutoDiscoveryUrlProperty[] = "WebProxyAutoDiscoveryUrl";
+constexpr char kiSNSOptionDataProperty[] = "iSNSOptionData"; // For RFC 4174.
// Passpoint credentials property names.
// EAP properties are defined above for EAP service.
-const char kPasspointCredentialsFQDNProperty[] = "FQDN";
-const char kPasspointCredentialsDomainsProperty[] = "Domains";
-const char kPasspointCredentialsRealmProperty[] = "Realm";
-const char kPasspointCredentialsHomeOIsProperty[] = "HomeOIs";
-const char kPasspointCredentialsRequiredHomeOIsProperty[] = "RequiredHomeOIs";
-const char kPasspointCredentialsRoamingConsortiaProperty[] = "RoamingConsortia";
-const char kPasspointCredentialsMeteredOverrideProperty[] = "MeteredOverride";
-const char kPasspointCredentialsAndroidPackageNameProperty[] =
+constexpr char kPasspointCredentialsFQDNProperty[] = "FQDN";
+constexpr char kPasspointCredentialsDomainsProperty[] = "Domains";
+constexpr char kPasspointCredentialsRealmProperty[] = "Realm";
+constexpr char kPasspointCredentialsHomeOIsProperty[] = "HomeOIs";
+constexpr char kPasspointCredentialsRequiredHomeOIsProperty[] =
+ "RequiredHomeOIs";
+constexpr char kPasspointCredentialsRoamingConsortiaProperty[] =
+ "RoamingConsortia";
+constexpr char kPasspointCredentialsMeteredOverrideProperty[] =
+ "MeteredOverride";
+constexpr char kPasspointCredentialsAndroidPackageNameProperty[] =
"AndroidPackageName";
-const char kPasspointCredentialsFriendlyNameProperty[] = "FriendlyName";
-const char kPasspointCredentialsExpirationTimeMillisecondsProperty[] =
+constexpr char kPasspointCredentialsFriendlyNameProperty[] = "FriendlyName";
+constexpr char kPasspointCredentialsExpirationTimeMillisecondsProperty[] =
"ExpirationTimeMilliseconds";
// Base Device property names.
-const char kAddressProperty[] = "Address"; // Also used for IPConfig.
-const char kInhibitedProperty[] = "Inhibited";
-const char kIPConfigsProperty[] = "IPConfigs";
-const char kIPv6DisabledProperty[] = "IPv6Disabled";
-const char kInterfaceProperty[] = "Interface"; // Network interface name.
+constexpr char kAddressProperty[] = "Address"; // Also used for IPConfig.
+constexpr char kInhibitedProperty[] = "Inhibited";
+constexpr char kIPConfigsProperty[] = "IPConfigs";
+constexpr char kIPv6DisabledProperty[] = "IPv6Disabled";
+constexpr char kInterfaceProperty[] = "Interface"; // Network interface name.
// kNameProperty: Defined above for Service. DEPRECATED (crbug.com/1011136).
-const char kPoweredProperty[] = "Powered";
-const char kScanIntervalProperty[] =
- "ScanInterval"; // For both Cellular and WiFi.
-const char kScanningProperty[] = "Scanning"; // For both Cellular and WiFi.
-const char kSelectedServiceProperty[] = "SelectedService";
+constexpr char kPoweredProperty[] = "Powered";
+constexpr char kScanIntervalProperty[] =
+ "ScanInterval"; // For both Cellular and WiFi.
+constexpr char kScanningProperty[] = "Scanning"; // For both Cellular and WiFi.
+constexpr char kSelectedServiceProperty[] = "SelectedService";
// Property names common to Cellular Device and Cellular Service.
-const char kEidProperty[] = "Cellular.EID";
-const char kIccidProperty[] = "Cellular.ICCID";
-const char kImsiProperty[] = "Cellular.IMSI";
+constexpr char kEidProperty[] = "Cellular.EID";
+constexpr char kIccidProperty[] = "Cellular.ICCID";
+constexpr char kImsiProperty[] = "Cellular.IMSI";
// kIccidProperty value when SIM card exists but ICCID is not available.
-const char kUnknownIccid[] = "unknown-iccid";
+constexpr char kUnknownIccid[] = "unknown-iccid";
// Cellular Device property names.
-const char kCellularApnListProperty[] = "Cellular.APNList";
-const char kCellularPolicyAllowRoamingProperty[] =
+constexpr char kCellularApnListProperty[] = "Cellular.APNList";
+constexpr char kCellularPolicyAllowRoamingProperty[] =
"Cellular.PolicyAllowRoaming";
-const char kDeviceIdProperty[] = "Cellular.DeviceID";
-const char kEquipmentIdProperty[] = "Cellular.EquipmentID";
-const char kEsnProperty[] = "Cellular.ESN";
-const char kFirmwareRevisionProperty[] = "Cellular.FirmwareRevision";
-const char kFoundNetworksProperty[] = "Cellular.FoundNetworks";
-const char kHardwareRevisionProperty[] = "Cellular.HardwareRevision";
-const char kHomeProviderProperty[] = "Cellular.HomeProvider";
-const char kImeiProperty[] = "Cellular.IMEI";
-const char kManufacturerProperty[] = "Cellular.Manufacturer";
-const char kMdnProperty[] = "Cellular.MDN";
-const char kMeidProperty[] = "Cellular.MEID";
-const char kModelIdProperty[] = "Cellular.ModelID";
-const char kMinProperty[] = "Cellular.MIN";
-const char kProviderRequiresRoamingProperty[] =
+constexpr char kDeviceIdProperty[] = "Cellular.DeviceID";
+constexpr char kEquipmentIdProperty[] = "Cellular.EquipmentID";
+constexpr char kEsnProperty[] = "Cellular.ESN";
+constexpr char kFirmwareRevisionProperty[] = "Cellular.FirmwareRevision";
+constexpr char kFoundNetworksProperty[] = "Cellular.FoundNetworks";
+constexpr char kHardwareRevisionProperty[] = "Cellular.HardwareRevision";
+constexpr char kHomeProviderProperty[] = "Cellular.HomeProvider";
+constexpr char kImeiProperty[] = "Cellular.IMEI";
+constexpr char kManufacturerProperty[] = "Cellular.Manufacturer";
+constexpr char kMdnProperty[] = "Cellular.MDN";
+constexpr char kMeidProperty[] = "Cellular.MEID";
+constexpr char kModelIdProperty[] = "Cellular.ModelID";
+constexpr char kMinProperty[] = "Cellular.MIN";
+constexpr char kProviderRequiresRoamingProperty[] =
"Cellular.ProviderRequiresRoaming";
-const char kSelectedNetworkProperty[] = "Cellular.SelectedNetwork";
-const char kSIMPresentProperty[] = "Cellular.SIMPresent";
-const char kSIMSlotInfoProperty[] = "Cellular.SIMSlotInfo";
-const char kSupportNetworkScanProperty[] = "Cellular.SupportNetworkScan";
-const char kUseAttachAPNProperty[] = "Cellular.UseAttachAPN";
-const char kPrimaryMultiplexedInterfaceProperty[] =
+constexpr char kSelectedNetworkProperty[] = "Cellular.SelectedNetwork";
+constexpr char kSIMPresentProperty[] = "Cellular.SIMPresent";
+constexpr char kSIMSlotInfoProperty[] = "Cellular.SIMSlotInfo";
+constexpr char kSupportNetworkScanProperty[] = "Cellular.SupportNetworkScan";
+constexpr char kUseAttachAPNProperty[] = "Cellular.UseAttachAPN";
+constexpr char kPrimaryMultiplexedInterfaceProperty[] =
"Cellular.PrimaryMultiplexedInterface";
-const char kDBusObjectProperty[] = "DBus.Object";
-const char kDBusServiceProperty[] = "DBus.Service";
+constexpr char kDBusObjectProperty[] = "DBus.Object";
+constexpr char kDBusServiceProperty[] = "DBus.Service";
// Ethernet Device property names.
-const char kEapAuthenticationCompletedProperty[] = "EapAuthenticationCompleted";
-const char kEapAuthenticatorDetectedProperty[] = "EapAuthenticatorDetected";
-const char kDeviceBusTypeProperty[] = "Ethernet.DeviceBusType";
-const char kLinkUpProperty[] = "Ethernet.LinkUp";
-const char kUsbEthernetMacAddressSourceProperty[] =
+constexpr char kEapAuthenticationCompletedProperty[] =
+ "EapAuthenticationCompleted";
+constexpr char kEapAuthenticatorDetectedProperty[] = "EapAuthenticatorDetected";
+constexpr char kDeviceBusTypeProperty[] = "Ethernet.DeviceBusType";
+constexpr char kLinkUpProperty[] = "Ethernet.LinkUp";
+constexpr char kUsbEthernetMacAddressSourceProperty[] =
"Ethernet.UsbEthernetMacAddressSource";
// WiFi Device property names.
-const char kBgscanMethodProperty[] = "BgscanMethod";
-const char kBgscanShortIntervalProperty[] = "BgscanShortInterval";
-const char kBgscanSignalThresholdProperty[] = "BgscanSignalThreshold";
-const char kForceWakeToScanTimerProperty[] = "ForceWakeToScanTimer";
-const char kLastWakeReasonProperty[] = "LastWakeReason";
-const char kLinkStatisticsProperty[] = "LinkStatistics";
-const char kMacAddressRandomizationEnabledProperty[] =
+constexpr char kBgscanMethodProperty[] = "BgscanMethod";
+constexpr char kBgscanShortIntervalProperty[] = "BgscanShortInterval";
+constexpr char kBgscanSignalThresholdProperty[] = "BgscanSignalThreshold";
+constexpr char kForceWakeToScanTimerProperty[] = "ForceWakeToScanTimer";
+constexpr char kLastWakeReasonProperty[] = "LastWakeReason";
+constexpr char kLinkStatisticsProperty[] = "LinkStatistics";
+constexpr char kMacAddressRandomizationEnabledProperty[] =
"MACAddressRandomizationEnabled";
-const char kMacAddressRandomizationSupportedProperty[] =
+constexpr char kMacAddressRandomizationSupportedProperty[] =
"MACAddressRandomizationSupported";
-const char kNetDetectScanPeriodSecondsProperty[] = "NetDetectScanPeriodSeconds";
-const char kPasspointInterworkingSelectEnabledProperty[] =
+constexpr char kNetDetectScanPeriodSecondsProperty[] =
+ "NetDetectScanPeriodSeconds";
+constexpr char kPasspointInterworkingSelectEnabledProperty[] =
"PasspointInterworkingSelectEnabled";
-const char kWakeOnWiFiSupportedProperty[] = "WakeOnWiFiSupported";
-const char kWakeOnWiFiAllowedProperty[] = "WakeOnWiFiAllowed";
-const char kWakeOnWiFiFeaturesEnabledProperty[] = "WakeOnWiFiFeaturesEnabled";
-const char kWakeToScanPeriodSecondsProperty[] = "WakeToScanPeriodSeconds";
+constexpr char kWakeOnWiFiSupportedProperty[] = "WakeOnWiFiSupported";
+constexpr char kWakeOnWiFiAllowedProperty[] = "WakeOnWiFiAllowed";
+constexpr char kWakeOnWiFiFeaturesEnabledProperty[] =
+ "WakeOnWiFiFeaturesEnabled";
+constexpr char kWakeToScanPeriodSecondsProperty[] = "WakeToScanPeriodSeconds";
// Profile property names.
-const char kEntriesProperty[] = "Entries";
+constexpr char kEntriesProperty[] = "Entries";
// kNameProperty: Defined above for Service.
// kServicesProperty: Defined above for Manager.
-const char kUserHashProperty[] = "UserHash";
-const char kAlwaysOnVpnModeProperty[] = "AlwaysOnVpnMode";
-const char kAlwaysOnVpnServiceProperty[] = "AlwaysOnVpnService";
+constexpr char kUserHashProperty[] = "UserHash";
+constexpr char kAlwaysOnVpnModeProperty[] = "AlwaysOnVpnMode";
+constexpr char kAlwaysOnVpnServiceProperty[] = "AlwaysOnVpnService";
// WiFi Service VendorInformation dictionary keys.
-const char kVendorOUIListProperty[] = "OUIList";
-const char kVendorWPSDeviceNameProperty[] = "DeviceName";
-const char kVendorWPSManufacturerProperty[] = "Manufacturer";
-const char kVendorWPSModelNameProperty[] = "ModelName";
-const char kVendorWPSModelNumberProperty[] = "ModelNumber";
+constexpr char kVendorOUIListProperty[] = "OUIList";
+constexpr char kVendorWPSDeviceNameProperty[] = "DeviceName";
+constexpr char kVendorWPSManufacturerProperty[] = "Manufacturer";
+constexpr char kVendorWPSModelNameProperty[] = "ModelName";
+constexpr char kVendorWPSModelNumberProperty[] = "ModelNumber";
// Flimflam state options.
-const char kStateIdle[] = "idle";
-const char kStateAssociation[] = "association";
-const char kStateConfiguration[] = "configuration";
-const char kStateReady[] = "ready";
-const char kStateNoConnectivity[] = "no-connectivity";
-const char kStateRedirectFound[] = "redirect-found";
-const char kStatePortalSuspected[] = "portal-suspected";
+constexpr char kStateIdle[] = "idle";
+constexpr char kStateAssociation[] = "association";
+constexpr char kStateConfiguration[] = "configuration";
+constexpr char kStateReady[] = "ready";
+constexpr char kStateNoConnectivity[] = "no-connectivity";
+constexpr char kStateRedirectFound[] = "redirect-found";
+constexpr char kStatePortalSuspected[] = "portal-suspected";
// TODO(b/260792466): This state is only used in the State property of Manager.
// Consider changing the to kStateIdle too, or removing the State property
// altogether if nothing depends on it.
-const char kStateOffline[] = "offline";
-const char kStateOnline[] = "online";
-const char kStateDisconnect[] = "disconnecting";
-const char kStateFailure[] = "failure";
+constexpr char kStateOffline[] = "offline";
+constexpr char kStateOnline[] = "online";
+constexpr char kStateDisconnect[] = "disconnecting";
+constexpr char kStateFailure[] = "failure";
// Shill WiFi roam state options.
-const char kRoamStateIdle[] = "idle";
-const char kRoamStateAssociation[] = "association";
-const char kRoamStateConfiguration[] = "configuration";
-const char kRoamStateReady[] = "ready";
+constexpr char kRoamStateIdle[] = "idle";
+constexpr char kRoamStateAssociation[] = "association";
+constexpr char kRoamStateConfiguration[] = "configuration";
+constexpr char kRoamStateReady[] = "ready";
// Shill Passpoint match type options.
-const char kPasspointMatchTypeHome[] = "home";
-const char kPasspointMatchTypeRoaming[] = "roaming";
-const char kPasspointMatchTypeUnknown[] = "unknown";
+constexpr char kPasspointMatchTypeHome[] = "home";
+constexpr char kPasspointMatchTypeRoaming[] = "roaming";
+constexpr char kPasspointMatchTypeUnknown[] = "unknown";
// Flimflam portal phase and status.
-const char kPortalDetectionPhaseConnection[] = "Connection";
-const char kPortalDetectionPhaseDns[] = "DNS";
-const char kPortalDetectionPhaseHttp[] = "HTTP";
-const char kPortalDetectionPhaseContent[] = "Content";
-const char kPortalDetectionPhaseUnknown[] = "Unknown";
-const char kPortalDetectionStatusFailure[] = "Failure";
-const char kPortalDetectionStatusTimeout[] = "Timeout";
-const char kPortalDetectionStatusSuccess[] = "Success";
-const char kPortalDetectionStatusRedirect[] = "Redirect";
+constexpr char kPortalDetectionPhaseConnection[] = "Connection";
+constexpr char kPortalDetectionPhaseDns[] = "DNS";
+constexpr char kPortalDetectionPhaseHttp[] = "HTTP";
+constexpr char kPortalDetectionPhaseContent[] = "Content";
+constexpr char kPortalDetectionPhaseUnknown[] = "Unknown";
+constexpr char kPortalDetectionStatusFailure[] = "Failure";
+constexpr char kPortalDetectionStatusTimeout[] = "Timeout";
+constexpr char kPortalDetectionStatusSuccess[] = "Success";
+constexpr char kPortalDetectionStatusRedirect[] = "Redirect";
// Flimflam property names for SIMLock status.
// kSIMLockStatusProperty is a Cellular Device property.
-const char kSIMLockStatusProperty[] = "Cellular.SIMLockStatus";
-const char kSIMLockTypeProperty[] = "LockType";
-const char kSIMLockRetriesLeftProperty[] = "RetriesLeft";
-const char kSIMLockEnabledProperty[] = "LockEnabled";
+constexpr char kSIMLockStatusProperty[] = "Cellular.SIMLockStatus";
+constexpr char kSIMLockTypeProperty[] = "LockType";
+constexpr char kSIMLockRetriesLeftProperty[] = "RetriesLeft";
+constexpr char kSIMLockEnabledProperty[] = "LockEnabled";
// Shill SIMSlotInfo properties.
-const char kSIMSlotInfoEID[] = "EID";
-const char kSIMSlotInfoICCID[] = "ICCID";
-const char kSIMSlotInfoPrimary[] = "Primary";
+constexpr char kSIMSlotInfoEID[] = "EID";
+constexpr char kSIMSlotInfoICCID[] = "ICCID";
+constexpr char kSIMSlotInfoPrimary[] = "Primary";
// Flimflam property names for Cellular.FoundNetworks.
-const char kLongNameProperty[] = "long_name";
-const char kStatusProperty[] = "status";
-const char kShortNameProperty[] = "short_name";
-const char kTechnologyProperty[] = "technology";
-const char kNetworkIdProperty[] = "network_id";
+constexpr char kLongNameProperty[] = "long_name";
+constexpr char kStatusProperty[] = "status";
+constexpr char kShortNameProperty[] = "short_name";
+constexpr char kTechnologyProperty[] = "technology";
+constexpr char kNetworkIdProperty[] = "network_id";
// Flimflam SIMLock status types.
-const char kSIMLockPin[] = "sim-pin";
-const char kSIMLockPuk[] = "sim-puk";
+constexpr char kSIMLockPin[] = "sim-pin";
+constexpr char kSIMLockPuk[] = "sim-puk";
// APN info property names.
-const char kApnProperty[] = "apn";
-const char kApnNetworkIdProperty[] = "network_id";
-const char kApnUsernameProperty[] = "username";
-const char kApnPasswordProperty[] = "password";
-const char kApnNameProperty[] = "name";
-const char kApnLocalizedNameProperty[] = "localized_name";
-const char kApnLanguageProperty[] = "language";
-const char kApnAuthenticationProperty[] = "authentication";
-const char kApnIsRequiredByCarrierSpecProperty[] =
+constexpr char kApnProperty[] = "apn";
+constexpr char kApnNetworkIdProperty[] = "network_id";
+constexpr char kApnUsernameProperty[] = "username";
+constexpr char kApnPasswordProperty[] = "password";
+constexpr char kApnNameProperty[] = "name";
+constexpr char kApnLocalizedNameProperty[] = "localized_name";
+constexpr char kApnLanguageProperty[] = "language";
+constexpr char kApnAuthenticationProperty[] = "authentication";
+constexpr char kApnIsRequiredByCarrierSpecProperty[] =
"is_required_by_carrier_spec";
// TODO(b/251551314): Remove kApnAttachProperty after 2025Q2
-const char kApnAttachProperty[] = "attach";
-const char kApnIpTypeProperty[] = "ip_type";
-const char kApnTypesProperty[] = "apn_types";
-const char kApnIdProperty[] = "id";
-const char kApnSourceProperty[] = "apn_source";
+constexpr char kApnAttachProperty[] = "attach";
+constexpr char kApnIpTypeProperty[] = "ip_type";
+constexpr char kApnTypesProperty[] = "apn_types";
+constexpr char kApnIdProperty[] = "id";
+constexpr char kApnSourceProperty[] = "apn_source";
// APN authentication property values (as expected by ModemManager).
-const char kApnAuthenticationPap[] = "pap";
-const char kApnAuthenticationChap[] = "chap";
+constexpr char kApnAuthenticationPap[] = "pap";
+constexpr char kApnAuthenticationChap[] = "chap";
// IP type property values.
-const char kApnIpTypeV4[] = "ipv4";
-const char kApnIpTypeV6[] = "ipv6";
-const char kApnIpTypeV4V6[] = "ipv4v6";
+constexpr char kApnIpTypeV4[] = "ipv4";
+constexpr char kApnIpTypeV6[] = "ipv6";
+constexpr char kApnIpTypeV4V6[] = "ipv4v6";
// APN type property values.
-const char kApnTypeDefault[] = "DEFAULT";
-const char kApnTypeIA[] = "IA";
-const char kApnTypeDun[] = "DUN";
+constexpr char kApnTypeDefault[] = "DEFAULT";
+constexpr char kApnTypeIA[] = "IA";
+constexpr char kApnTypeDun[] = "DUN";
// APN source property values.
-const char kApnSourceAdmin[] = "admin";
-const char kApnSourceUi[] = "ui";
+constexpr char kApnSourceAdmin[] = "admin";
+constexpr char kApnSourceUi[] = "ui";
// APN IsRequiredByCarrierSpec values.
-const char kApnIsRequiredByCarrierSpecTrue[] = "1";
-const char kApnIsRequiredByCarrierSpecFalse[] = "0";
+constexpr char kApnIsRequiredByCarrierSpecTrue[] = "1";
+constexpr char kApnIsRequiredByCarrierSpecFalse[] = "0";
// Payment Portal property names.
-const char kPaymentPortalURL[] = "url";
-const char kPaymentPortalMethod[] = "method";
-const char kPaymentPortalPostData[] = "postdata";
+constexpr char kPaymentPortalURL[] = "url";
+constexpr char kPaymentPortalMethod[] = "method";
+constexpr char kPaymentPortalPostData[] = "postdata";
// Operator info property names.
-const char kOperatorNameKey[] = "name";
-const char kOperatorCodeKey[] = "code";
-const char kOperatorCountryKey[] = "country";
-const char kOperatorUuidKey[] = "uuid";
+constexpr char kOperatorNameKey[] = "name";
+constexpr char kOperatorCodeKey[] = "code";
+constexpr char kOperatorCountryKey[] = "country";
+constexpr char kOperatorUuidKey[] = "uuid";
// Flimflam network technology options.
-const char kNetworkTechnology1Xrtt[] = "1xRTT";
-const char kNetworkTechnologyEvdo[] = "EVDO";
-const char kNetworkTechnologyGsm[] = "GSM";
-const char kNetworkTechnologyGprs[] = "GPRS";
-const char kNetworkTechnologyEdge[] = "EDGE";
-const char kNetworkTechnologyUmts[] = "UMTS";
-const char kNetworkTechnologyHspa[] = "HSPA";
-const char kNetworkTechnologyHspaPlus[] = "HSPA+";
-const char kNetworkTechnologyLte[] = "LTE";
-const char kNetworkTechnologyLteAdvanced[] = "LTE Advanced";
-const char kNetworkTechnology5gNr[] = "5GNR";
+constexpr char kNetworkTechnology1Xrtt[] = "1xRTT";
+constexpr char kNetworkTechnologyEvdo[] = "EVDO";
+constexpr char kNetworkTechnologyGsm[] = "GSM";
+constexpr char kNetworkTechnologyGprs[] = "GPRS";
+constexpr char kNetworkTechnologyEdge[] = "EDGE";
+constexpr char kNetworkTechnologyUmts[] = "UMTS";
+constexpr char kNetworkTechnologyHspa[] = "HSPA";
+constexpr char kNetworkTechnologyHspaPlus[] = "HSPA+";
+constexpr char kNetworkTechnologyLte[] = "LTE";
+constexpr char kNetworkTechnologyLteAdvanced[] = "LTE Advanced";
+constexpr char kNetworkTechnology5gNr[] = "5GNR";
// Flimflam roaming state options
-const char kRoamingStateHome[] = "home";
-const char kRoamingStateRoaming[] = "roaming";
-const char kRoamingStateUnknown[] = "unknown";
+constexpr char kRoamingStateHome[] = "home";
+constexpr char kRoamingStateRoaming[] = "roaming";
+constexpr char kRoamingStateUnknown[] = "unknown";
// Flimflam activation state options
-const char kActivationStateActivated[] = "activated";
-const char kActivationStateActivating[] = "activating";
-const char kActivationStateNotActivated[] = "not-activated";
-const char kActivationStatePartiallyActivated[] = "partially-activated";
-const char kActivationStateUnknown[] = "unknown";
+constexpr char kActivationStateActivated[] = "activated";
+constexpr char kActivationStateActivating[] = "activating";
+constexpr char kActivationStateNotActivated[] = "not-activated";
+constexpr char kActivationStatePartiallyActivated[] = "partially-activated";
+constexpr char kActivationStateUnknown[] = "unknown";
// Flimflam EAP method options.
-const char kEapMethodPEAP[] = "PEAP";
-const char kEapMethodTLS[] = "TLS";
-const char kEapMethodTTLS[] = "TTLS";
-const char kEapMethodLEAP[] = "LEAP";
-const char kEapMethodMSCHAPV2[] = "MSCHAPV2";
+constexpr char kEapMethodPEAP[] = "PEAP";
+constexpr char kEapMethodTLS[] = "TLS";
+constexpr char kEapMethodTTLS[] = "TTLS";
+constexpr char kEapMethodLEAP[] = "LEAP";
+constexpr char kEapMethodMSCHAPV2[] = "MSCHAPV2";
// Flimflam EAP phase 2 auth options.
-const char kEapPhase2AuthPEAPMD5[] = "auth=MD5";
-const char kEapPhase2AuthPEAPMSCHAPV2[] = "auth=MSCHAPV2";
-const char kEapPhase2AuthPEAPGTC[] = "auth=GTC";
-const char kEapPhase2AuthTTLSMD5[] = "autheap=MD5"; // crosbug/26822
-const char kEapPhase2AuthTTLSEAPMD5[] = "autheap=MD5";
-const char kEapPhase2AuthTTLSEAPMSCHAPV2[] = "autheap=MSCHAPV2";
-const char kEapPhase2AuthTTLSMSCHAPV2[] = "auth=MSCHAPV2";
-const char kEapPhase2AuthTTLSMSCHAP[] = "auth=MSCHAP";
-const char kEapPhase2AuthTTLSPAP[] = "auth=PAP";
-const char kEapPhase2AuthTTLSCHAP[] = "auth=CHAP";
-const char kEapPhase2AuthTTLSGTC[] = "auth=GTC";
-const char kEapPhase2AuthTTLSEAPGTC[] = "autheap=GTC";
+constexpr char kEapPhase2AuthPEAPMD5[] = "auth=MD5";
+constexpr char kEapPhase2AuthPEAPMSCHAPV2[] = "auth=MSCHAPV2";
+constexpr char kEapPhase2AuthPEAPGTC[] = "auth=GTC";
+constexpr char kEapPhase2AuthTTLSMD5[] = "autheap=MD5"; // crosbug/26822
+constexpr char kEapPhase2AuthTTLSEAPMD5[] = "autheap=MD5";
+constexpr char kEapPhase2AuthTTLSEAPMSCHAPV2[] = "autheap=MSCHAPV2";
+constexpr char kEapPhase2AuthTTLSMSCHAPV2[] = "auth=MSCHAPV2";
+constexpr char kEapPhase2AuthTTLSMSCHAP[] = "auth=MSCHAP";
+constexpr char kEapPhase2AuthTTLSPAP[] = "auth=PAP";
+constexpr char kEapPhase2AuthTTLSCHAP[] = "auth=CHAP";
+constexpr char kEapPhase2AuthTTLSGTC[] = "auth=GTC";
+constexpr char kEapPhase2AuthTTLSEAPGTC[] = "autheap=GTC";
// Flimflam EAP TLS versions.
-const char kEapTLSVersion1p0[] = "1.0";
-const char kEapTLSVersion1p1[] = "1.1";
-const char kEapTLSVersion1p2[] = "1.2";
+constexpr char kEapTLSVersion1p0[] = "1.0";
+constexpr char kEapTLSVersion1p1[] = "1.1";
+constexpr char kEapTLSVersion1p2[] = "1.2";
// Flimflam VPN provider types.
-const char kProviderArcVpn[] = "arcvpn";
-const char kProviderIKEv2[] = "ikev2";
-const char kProviderL2tpIpsec[] = "l2tpipsec";
-const char kProviderOpenVpn[] = "openvpn";
-const char kProviderThirdPartyVpn[] = "thirdpartyvpn";
-const char kProviderWireGuard[] = "wireguard";
+constexpr char kProviderArcVpn[] = "arcvpn";
+constexpr char kProviderIKEv2[] = "ikev2";
+constexpr char kProviderL2tpIpsec[] = "l2tpipsec";
+constexpr char kProviderOpenVpn[] = "openvpn";
+constexpr char kProviderThirdPartyVpn[] = "thirdpartyvpn";
+constexpr char kProviderWireGuard[] = "wireguard";
// Flimflam monitored properties
-const char kMonitorPropertyChanged[] = "PropertyChanged";
+constexpr char kMonitorPropertyChanged[] = "PropertyChanged";
// Flimflam type options.
-const char kTypeEthernet[] = "ethernet";
-const char kTypeWifi[] = "wifi";
-const char kTypeCellular[] = "cellular";
-const char kTypeVPN[] = "vpn";
+constexpr char kTypeEthernet[] = "ethernet";
+constexpr char kTypeWifi[] = "wifi";
+constexpr char kTypeCellular[] = "cellular";
+constexpr char kTypeVPN[] = "vpn";
// Flimflam mode options.
-const char kModeManaged[] = "managed";
+constexpr char kModeManaged[] = "managed";
// WiFi SecurityClass options.
-const char kSecurityClassNone[] = "none";
-const char kSecurityClassWep[] = "wep";
-const char kSecurityClassPsk[] = "psk";
-const char kSecurityClass8021x[] = "802_1x";
+constexpr char kSecurityClassNone[] = "none";
+constexpr char kSecurityClassWep[] = "wep";
+constexpr char kSecurityClassPsk[] = "psk";
+constexpr char kSecurityClass8021x[] = "802_1x";
// These two are deprecated. Use kSecurityClass* equivalents above.
// TODO(b/226138492) Remove this once references in Chrome and Shill are
// removed.
-const char kSecurityPsk[] = "psk";
-const char kSecurity8021x[] = "802_1x";
+constexpr char kSecurityPsk[] = "psk";
+constexpr char kSecurity8021x[] = "802_1x";
// WiFi Security options.
-const char kSecurityNone[] = "none";
-const char kSecurityWep[] = "wep";
-const char kSecurityWpa[] = "wpa";
-const char kSecurityWpaWpa2[] = "wpa+wpa2";
-const char kSecurityWpaAll[] = "wpa-all";
+constexpr char kSecurityNone[] = "none";
+constexpr char kSecurityWep[] = "wep";
+constexpr char kSecurityWpa[] = "wpa";
+constexpr char kSecurityWpaWpa2[] = "wpa+wpa2";
+constexpr char kSecurityWpaAll[] = "wpa-all";
// Deprecated. Use kSecurityWpa2 instead.
// TODO(b/226138492) Remove this once references in Chrome and Shill are
// removed.
-const char kSecurityRsn[] = "rsn";
-const char kSecurityWpa2[] = "wpa2";
-const char kSecurityWpa2Wpa3[] = "wpa2+wpa3";
-const char kSecurityWpa3[] = "wpa3";
-const char kSecurityWpaEnterprise[] = "wpa-ent";
-const char kSecurityWpaWpa2Enterprise[] = "wpa+wpa2-ent";
-const char kSecurityWpaAllEnterprise[] = "wpa-all-ent";
-const char kSecurityWpa2Enterprise[] = "wpa2-ent";
-const char kSecurityWpa2Wpa3Enterprise[] = "wpa2+wpa3-ent";
-const char kSecurityWpa3Enterprise[] = "wpa3-ent";
+constexpr char kSecurityRsn[] = "rsn";
+constexpr char kSecurityWpa2[] = "wpa2";
+constexpr char kSecurityWpa2Wpa3[] = "wpa2+wpa3";
+constexpr char kSecurityWpa3[] = "wpa3";
+constexpr char kSecurityWpaEnterprise[] = "wpa-ent";
+constexpr char kSecurityWpaWpa2Enterprise[] = "wpa+wpa2-ent";
+constexpr char kSecurityWpaAllEnterprise[] = "wpa-all-ent";
+constexpr char kSecurityWpa2Enterprise[] = "wpa2-ent";
+constexpr char kSecurityWpa2Wpa3Enterprise[] = "wpa2+wpa3-ent";
+constexpr char kSecurityWpa3Enterprise[] = "wpa3-ent";
// WiFi Band options.
-const char kBand2GHz[] = "2.4GHz";
-const char kBand5GHz[] = "5GHz";
-const char kBandAll[] = "all-bands";
-const char kBandUnknown[] = "unknown";
+constexpr char kBand2GHz[] = "2.4GHz";
+constexpr char kBand5GHz[] = "5GHz";
+constexpr char kBandAll[] = "all-bands";
+constexpr char kBandUnknown[] = "unknown";
// Compress option values as expected by OpenVPN.
-const char kOpenVPNCompressFramingOnly[] = "";
-const char kOpenVPNCompressLz4[] = "lz4";
-const char kOpenVPNCompressLz4V2[] = "lz4-v2";
-const char kOpenVPNCompressLzo[] = "lzo";
+constexpr char kOpenVPNCompressFramingOnly[] = "";
+constexpr char kOpenVPNCompressLz4[] = "lz4";
+constexpr char kOpenVPNCompressLz4V2[] = "lz4-v2";
+constexpr char kOpenVPNCompressLzo[] = "lzo";
// FlimFlam technology family options
-const char kTechnologyFamilyCdma[] = "CDMA";
-const char kTechnologyFamilyGsm[] = "GSM";
+constexpr char kTechnologyFamilyCdma[] = "CDMA";
+constexpr char kTechnologyFamilyGsm[] = "GSM";
// IPConfig type options.
-const char kTypeIPv4[] = "ipv4";
-const char kTypeIPv6[] = "ipv6";
-const char kTypeDHCP[] = "dhcp";
-const char kTypeBOOTP[] = "bootp";
-const char kTypeZeroConf[] = "zeroconf";
-const char kTypeDHCP6[] = "dhcp6";
+constexpr char kTypeIPv4[] = "ipv4";
+constexpr char kTypeIPv6[] = "ipv6";
+constexpr char kTypeDHCP[] = "dhcp";
+constexpr char kTypeBOOTP[] = "bootp";
+constexpr char kTypeZeroConf[] = "zeroconf";
+constexpr char kTypeDHCP6[] = "dhcp6";
// kTypeVPN[] = "vpn" is defined above in device type session.
// Flimflam error options.
-const char kErrorAaaFailed[] = "aaa-failed";
-const char kErrorActivationFailed[] = "activation-failed";
-const char kErrorBadPassphrase[] = "bad-passphrase";
-const char kErrorBadWEPKey[] = "bad-wepkey";
-const char kErrorConnectFailed[] = "connect-failed";
-const char kErrorDNSLookupFailed[] = "dns-lookup-failed";
-const char kErrorDhcpFailed[] = "dhcp-failed";
-const char kErrorHTTPGetFailed[] = "http-get-failed";
-const char kErrorInternal[] = "internal-error";
-const char kErrorInvalidFailure[] = "invalid-failure";
-const char kErrorInvalidAPN[] = "invalid-apn";
-const char kErrorIpsecCertAuthFailed[] = "ipsec-cert-auth-failed";
-const char kErrorIpsecPskAuthFailed[] = "ipsec-psk-auth-failed";
-const char kErrorNeedEvdo[] = "need-evdo";
-const char kErrorNeedHomeNetwork[] = "need-home-network";
-const char kErrorNoFailure[] = "no-failure";
-const char kErrorNotAssociated[] = "not-associated";
-const char kErrorNotAuthenticated[] = "not-authenticated";
-const char kErrorOtaspFailed[] = "otasp-failed";
-const char kErrorOutOfRange[] = "out-of-range";
-const char kErrorPinMissing[] = "pin-missing";
-const char kErrorPppAuthFailed[] = "ppp-auth-failed";
-const char kErrorSimLocked[] = "sim-locked";
-const char kErrorNotRegistered[] = "not-registered";
-const char kErrorTooManySTAs[] = "too-many-stas";
-const char kErrorDisconnect[] = "disconnect-failure";
-const char kErrorUnknownFailure[] = "unknown-failure";
+constexpr char kErrorAaaFailed[] = "aaa-failed";
+constexpr char kErrorActivationFailed[] = "activation-failed";
+constexpr char kErrorBadPassphrase[] = "bad-passphrase";
+constexpr char kErrorBadWEPKey[] = "bad-wepkey";
+constexpr char kErrorConnectFailed[] = "connect-failed";
+constexpr char kErrorDNSLookupFailed[] = "dns-lookup-failed";
+constexpr char kErrorDhcpFailed[] = "dhcp-failed";
+constexpr char kErrorHTTPGetFailed[] = "http-get-failed";
+constexpr char kErrorInternal[] = "internal-error";
+constexpr char kErrorInvalidFailure[] = "invalid-failure";
+constexpr char kErrorInvalidAPN[] = "invalid-apn";
+constexpr char kErrorIpsecCertAuthFailed[] = "ipsec-cert-auth-failed";
+constexpr char kErrorIpsecPskAuthFailed[] = "ipsec-psk-auth-failed";
+constexpr char kErrorNeedEvdo[] = "need-evdo";
+constexpr char kErrorNeedHomeNetwork[] = "need-home-network";
+constexpr char kErrorNoFailure[] = "no-failure";
+constexpr char kErrorNotAssociated[] = "not-associated";
+constexpr char kErrorNotAuthenticated[] = "not-authenticated";
+constexpr char kErrorOtaspFailed[] = "otasp-failed";
+constexpr char kErrorOutOfRange[] = "out-of-range";
+constexpr char kErrorPinMissing[] = "pin-missing";
+constexpr char kErrorPppAuthFailed[] = "ppp-auth-failed";
+constexpr char kErrorSimLocked[] = "sim-locked";
+constexpr char kErrorNotRegistered[] = "not-registered";
+constexpr char kErrorTooManySTAs[] = "too-many-stas";
+constexpr char kErrorDisconnect[] = "disconnect-failure";
+constexpr char kErrorUnknownFailure[] = "unknown-failure";
// Flimflam error result codes.
-const char kErrorResultSuccess[] = "org.chromium.flimflam.Error.Success";
-const char kErrorResultFailure[] = "org.chromium.flimflam.Error.Failure";
-const char kErrorResultAlreadyConnected[] =
+constexpr char kErrorResultSuccess[] = "org.chromium.flimflam.Error.Success";
+constexpr char kErrorResultFailure[] = "org.chromium.flimflam.Error.Failure";
+constexpr char kErrorResultAlreadyConnected[] =
"org.chromium.flimflam.Error.AlreadyConnected";
-const char kErrorResultAlreadyExists[] =
+constexpr char kErrorResultAlreadyExists[] =
"org.chromium.flimflam.Error.AlreadyExists";
-const char kErrorResultIllegalOperation[] =
+constexpr char kErrorResultIllegalOperation[] =
"org.chromium.flimflam.Error.IllegalOperation";
-const char kErrorResultIncorrectPin[] =
+constexpr char kErrorResultIncorrectPin[] =
"org.chromium.flimflam.Error.IncorrectPin";
-const char kErrorResultInProgress[] = "org.chromium.flimflam.Error.InProgress";
-const char kErrorResultInternalError[] =
+constexpr char kErrorResultInProgress[] =
+ "org.chromium.flimflam.Error.InProgress";
+constexpr char kErrorResultInternalError[] =
"org.chromium.flimflam.Error.InternalError";
-const char kErrorResultInvalidApn[] = "org.chromium.flimflam.Error.InvalidApn";
-const char kErrorResultInvalidArguments[] =
+constexpr char kErrorResultInvalidApn[] =
+ "org.chromium.flimflam.Error.InvalidApn";
+constexpr char kErrorResultInvalidArguments[] =
"org.chromium.flimflam.Error.InvalidArguments";
-const char kErrorResultInvalidNetworkName[] =
+constexpr char kErrorResultInvalidNetworkName[] =
"org.chromium.flimflam.Error.InvalidNetworkName";
-const char kErrorResultInvalidPassphrase[] =
+constexpr char kErrorResultInvalidPassphrase[] =
"org.chromium.flimflam.Error.InvalidPassphrase";
-const char kErrorResultInvalidProperty[] =
+constexpr char kErrorResultInvalidProperty[] =
"org.chromium.flimflam.Error.InvalidProperty";
-const char kErrorResultNoCarrier[] = "org.chromium.flimflam.Error.NoCarrier";
-const char kErrorResultNotConnected[] =
+constexpr char kErrorResultNoCarrier[] =
+ "org.chromium.flimflam.Error.NoCarrier";
+constexpr char kErrorResultNotConnected[] =
"org.chromium.flimflam.Error.NotConnected";
-const char kErrorResultNotFound[] = "org.chromium.flimflam.Error.NotFound";
-const char kErrorResultNotImplemented[] =
+constexpr char kErrorResultNotFound[] = "org.chromium.flimflam.Error.NotFound";
+constexpr char kErrorResultNotImplemented[] =
"org.chromium.flimflam.Error.NotImplemented";
-const char kErrorResultNotOnHomeNetwork[] =
+constexpr char kErrorResultNotOnHomeNetwork[] =
"org.chromium.flimflam.Error.NotOnHomeNetwork";
-const char kErrorResultNotRegistered[] =
+constexpr char kErrorResultNotRegistered[] =
"org.chromium.flimflam.Error.NotRegistered";
-const char kErrorResultNotSupported[] =
+constexpr char kErrorResultNotSupported[] =
"org.chromium.flimflam.Error.NotSupported";
-const char kErrorResultOperationAborted[] =
+constexpr char kErrorResultOperationAborted[] =
"org.chromium.flimflam.Error.OperationAborted";
-const char kErrorResultOperationInitiated[] =
+constexpr char kErrorResultOperationInitiated[] =
"org.chromium.flimflam.Error.OperationInitiated";
-const char kErrorResultOperationTimeout[] =
+constexpr char kErrorResultOperationTimeout[] =
"org.chromium.flimflam.Error.OperationTimeout";
-const char kErrorResultPassphraseRequired[] =
+constexpr char kErrorResultPassphraseRequired[] =
"org.chromium.flimflam.Error.PassphraseRequired";
-const char kErrorResultPermissionDenied[] =
+constexpr char kErrorResultPermissionDenied[] =
"org.chromium.flimflam.Error.PermissionDenied";
-const char kErrorResultPinBlocked[] = "org.chromium.flimflam.Error.PinBlocked";
-const char kErrorResultPinRequired[] =
+constexpr char kErrorResultPinBlocked[] =
+ "org.chromium.flimflam.Error.PinBlocked";
+constexpr char kErrorResultPinRequired[] =
"org.chromium.flimflam.Error.PinRequired";
-const char kErrorResultTechnologyNotAvailable[] =
+constexpr char kErrorResultTechnologyNotAvailable[] =
"org.chromium.flimflam.Error.TechnologyNotAvailable";
-const char kErrorResultWepNotSupported[] =
+constexpr char kErrorResultWepNotSupported[] =
"org.chromium.flimflam.Error.WepNotSupported";
-const char kErrorResultWrongState[] = "org.chromium.flimflam.Error.WrongState";
+constexpr char kErrorResultWrongState[] =
+ "org.chromium.flimflam.Error.WrongState";
-const char kUnknownString[] = "UNKNOWN";
+constexpr char kUnknownString[] = "UNKNOWN";
// Device bus types.
-const char kDeviceBusTypePci[] = "pci";
-const char kDeviceBusTypeUsb[] = "usb";
+constexpr char kDeviceBusTypePci[] = "pci";
+constexpr char kDeviceBusTypeUsb[] = "usb";
// Technology types (augments "Flimflam type options" above).
-const char kTypeEthernetEap[] = "etherneteap";
-const char kTypeTunnel[] = "tunnel";
-const char kTypeLoopback[] = "loopback";
-const char kTypePPP[] = "ppp";
-const char kTypeGuestInterface[] = "guest_interface";
-const char kTypeUnknown[] = "unknown";
+constexpr char kTypeEthernetEap[] = "etherneteap";
+constexpr char kTypeTunnel[] = "tunnel";
+constexpr char kTypeLoopback[] = "loopback";
+constexpr char kTypePPP[] = "ppp";
+constexpr char kTypeGuestInterface[] = "guest_interface";
+constexpr char kTypeUnknown[] = "unknown";
// Error strings.
-const char kErrorEapAuthenticationFailed[] = "eap-authentication-failed";
-const char kErrorEapLocalTlsFailed[] = "eap-local-tls-failed";
-const char kErrorEapRemoteTlsFailed[] = "eap-remote-tls-failed";
+constexpr char kErrorEapAuthenticationFailed[] = "eap-authentication-failed";
+constexpr char kErrorEapLocalTlsFailed[] = "eap-local-tls-failed";
+constexpr char kErrorEapRemoteTlsFailed[] = "eap-remote-tls-failed";
// Subject alternative name match type property values as expected by
// wpa_supplicant.
-const char kEapSubjectAlternativeNameMatchTypeEmail[] = "EMAIL";
-const char kEapSubjectAlternativeNameMatchTypeDNS[] = "DNS";
-const char kEapSubjectAlternativeNameMatchTypeURI[] = "URI";
+constexpr char kEapSubjectAlternativeNameMatchTypeEmail[] = "EMAIL";
+constexpr char kEapSubjectAlternativeNameMatchTypeDNS[] = "DNS";
+constexpr char kEapSubjectAlternativeNameMatchTypeURI[] = "URI";
// WiFi Device kLinkStatisticsProperty sub-property names.
-const char kAverageReceiveSignalDbmProperty[] = "AverageReceiveSignalDbm";
-const char kByteReceiveSuccessesProperty[] = "ByteReceiveSuccesses";
-const char kByteTransmitSuccessesProperty[] = "ByteTransmitSuccesses";
-const char kInactiveTimeMillisecondsProperty[] = "InactiveTimeMilliseconds";
-const char kLastReceiveSignalDbmProperty[] = "LastReceiveSignalDbm";
-const char kPacketReceiveDropProperty[] = "PacketReceiveDrops";
-const char kPacketReceiveSuccessesProperty[] = "PacketReceiveSuccesses";
-const char kPacketTransmitFailuresProperty[] = "PacketTransmitFailures";
-const char kPacketTransmitSuccessesProperty[] = "PacketTransmitSuccesses";
-const char kReceiveBitrateProperty[] = "ReceiveBitrate";
-const char kTransmitBitrateProperty[] = "TransmitBitrate";
-const char kTransmitRetriesProperty[] = "TransmitRetries";
+constexpr char kAverageReceiveSignalDbmProperty[] = "AverageReceiveSignalDbm";
+constexpr char kByteReceiveSuccessesProperty[] = "ByteReceiveSuccesses";
+constexpr char kByteTransmitSuccessesProperty[] = "ByteTransmitSuccesses";
+constexpr char kInactiveTimeMillisecondsProperty[] = "InactiveTimeMilliseconds";
+constexpr char kLastReceiveSignalDbmProperty[] = "LastReceiveSignalDbm";
+constexpr char kPacketReceiveDropProperty[] = "PacketReceiveDrops";
+constexpr char kPacketReceiveSuccessesProperty[] = "PacketReceiveSuccesses";
+constexpr char kPacketTransmitFailuresProperty[] = "PacketTransmitFailures";
+constexpr char kPacketTransmitSuccessesProperty[] = "PacketTransmitSuccesses";
+constexpr char kReceiveBitrateProperty[] = "ReceiveBitrate";
+constexpr char kTransmitBitrateProperty[] = "TransmitBitrate";
+constexpr char kTransmitRetriesProperty[] = "TransmitRetries";
// Wake on WiFi features.
-const char kWakeOnWiFiFeaturesEnabledDarkConnect[] = "darkconnect";
-const char kWakeOnWiFiFeaturesEnabledNone[] = "none";
+constexpr char kWakeOnWiFiFeaturesEnabledDarkConnect[] = "darkconnect";
+constexpr char kWakeOnWiFiFeaturesEnabledNone[] = "none";
// Wake on WiFi wake reasons.
// These (except Unknown) will also be sent to powerd via
// RecordDarkResumeWakeReason, to tell it the reason of the current dark
// resume.
-const char kWakeOnWiFiReasonDisconnect[] = "WiFi.Disconnect";
-const char kWakeOnWiFiReasonPattern[] = "WiFi.Pattern";
-const char kWakeOnWiFiReasonSSID[] = "WiFi.SSID";
-const char kWakeOnWiFiReasonUnknown[] = "Unknown";
+constexpr char kWakeOnWiFiReasonDisconnect[] = "WiFi.Disconnect";
+constexpr char kWakeOnWiFiReasonPattern[] = "WiFi.Pattern";
+constexpr char kWakeOnWiFiReasonSSID[] = "WiFi.SSID";
+constexpr char kWakeOnWiFiReasonUnknown[] = "Unknown";
// kEapKeyMgmtProperty values.
-const char kKeyManagementIEEE8021X[] = "IEEE8021X";
+constexpr char kKeyManagementIEEE8021X[] = "IEEE8021X";
// Wake on WiFi Packet Type Constants.
-const char kWakeOnTCP[] = "TCP";
-const char kWakeOnUDP[] = "UDP";
-const char kWakeOnIDP[] = "IDP";
-const char kWakeOnIPIP[] = "IPIP";
-const char kWakeOnIGMP[] = "IGMP";
-const char kWakeOnICMP[] = "ICMP";
-const char kWakeOnIP[] = "IP";
+constexpr char kWakeOnTCP[] = "TCP";
+constexpr char kWakeOnUDP[] = "UDP";
+constexpr char kWakeOnIDP[] = "IDP";
+constexpr char kWakeOnIPIP[] = "IPIP";
+constexpr char kWakeOnIGMP[] = "IGMP";
+constexpr char kWakeOnICMP[] = "ICMP";
+constexpr char kWakeOnIP[] = "IP";
// ONC Source constants.
static constexpr char kONCSourceUnknown[] = "Unknown";
@@ -871,133 +896,135 @@
"NonPersistentRandom";
// Cellular activation types.
-const char kActivationTypeNonCellular[] = "NonCellular"; // For future use
-const char kActivationTypeOMADM[] = "OMADM"; // For future use
-const char kActivationTypeOTA[] = "OTA";
-const char kActivationTypeOTASP[] = "OTASP";
+constexpr char kActivationTypeNonCellular[] = "NonCellular"; // For future use
+constexpr char kActivationTypeOMADM[] = "OMADM"; // For future use
+constexpr char kActivationTypeOTA[] = "OTA";
+constexpr char kActivationTypeOTASP[] = "OTASP";
// USB Ethernet MAC address sources.
-const char kUsbEthernetMacAddressSourceDesignatedDockMac[] =
+constexpr char kUsbEthernetMacAddressSourceDesignatedDockMac[] =
"designated_dock_mac";
-const char kUsbEthernetMacAddressSourceBuiltinAdapterMac[] =
+constexpr char kUsbEthernetMacAddressSourceBuiltinAdapterMac[] =
"builtin_adapter_mac";
-const char kUsbEthernetMacAddressSourceUsbAdapterMac[] = "usb_adapter_mac";
+constexpr char kUsbEthernetMacAddressSourceUsbAdapterMac[] = "usb_adapter_mac";
// Geolocation property field names.
// Reference:
// https://devsite.googleplex.com/maps/documentation/business/geolocation/
// Top level properties for a Geolocation request.
-const char kGeoHomeMobileCountryCodeProperty[] = "homeMobileCountryCode";
-const char kGeoHomeMobileNetworkCodeProperty[] = "homeMobileNetworkCode";
-const char kGeoRadioTypePropertyProperty[] = "radioType";
-const char kGeoCellTowersProperty[] = "cellTowers";
-const char kGeoWifiAccessPointsProperty[] = "wifiAccessPoints";
+constexpr char kGeoHomeMobileCountryCodeProperty[] = "homeMobileCountryCode";
+constexpr char kGeoHomeMobileNetworkCodeProperty[] = "homeMobileNetworkCode";
+constexpr char kGeoRadioTypePropertyProperty[] = "radioType";
+constexpr char kGeoCellTowersProperty[] = "cellTowers";
+constexpr char kGeoWifiAccessPointsProperty[] = "wifiAccessPoints";
// Cell tower object property names.
-const char kGeoCellIdProperty[] = "cellId";
-const char kGeoLocationAreaCodeProperty[] = "locationAreaCode";
-const char kGeoMobileCountryCodeProperty[] = "mobileCountryCode";
-const char kGeoMobileNetworkCodeProperty[] = "mobileNetworkCode";
-const char kGeoTimingAdvanceProperty[] = "timingAdvance";
+constexpr char kGeoCellIdProperty[] = "cellId";
+constexpr char kGeoLocationAreaCodeProperty[] = "locationAreaCode";
+constexpr char kGeoMobileCountryCodeProperty[] = "mobileCountryCode";
+constexpr char kGeoMobileNetworkCodeProperty[] = "mobileNetworkCode";
+constexpr char kGeoTimingAdvanceProperty[] = "timingAdvance";
// WiFi access point property names.
-const char kGeoMacAddressProperty[] = "macAddress";
-const char kGeoChannelProperty[] = "channel";
-const char kGeoSignalToNoiseRatioProperty[] = "signalToNoiseRatio";
+constexpr char kGeoMacAddressProperty[] = "macAddress";
+constexpr char kGeoChannelProperty[] = "channel";
+constexpr char kGeoSignalToNoiseRatioProperty[] = "signalToNoiseRatio";
// Common property names for geolocation objects.
-const char kGeoAgeProperty[] = "age";
-const char kGeoSignalStrengthProperty[] = "signalStrength";
+constexpr char kGeoAgeProperty[] = "age";
+constexpr char kGeoSignalStrengthProperty[] = "signalStrength";
// ThirdPartyVpn parameters and constants.
-const char kAddressParameterThirdPartyVpn[] = "address";
-const char kBroadcastAddressParameterThirdPartyVpn[] = "broadcast_address";
-const char kGatewayParameterThirdPartyVpn[] = "gateway";
-const char kBypassTunnelForIpParameterThirdPartyVpn[] = "bypass_tunnel_for_ip";
-const char kSubnetPrefixParameterThirdPartyVpn[] = "subnet_prefix";
-const char kMtuParameterThirdPartyVpn[] = "mtu";
-const char kDomainSearchParameterThirdPartyVpn[] = "domain_search";
-const char kDnsServersParameterThirdPartyVpn[] = "dns_servers";
-const char kInclusionListParameterThirdPartyVpn[] = "inclusion_list";
-const char kExclusionListParameterThirdPartyVpn[] = "exclusion_list";
-const char kReconnectParameterThirdPartyVpn[] = "reconnect";
-const char kObjectPathBase[] = "/thirdpartyvpn/";
-const char kNonIPDelimiter = ':';
-const char kIPDelimiter = ' ';
+constexpr char kAddressParameterThirdPartyVpn[] = "address";
+constexpr char kBroadcastAddressParameterThirdPartyVpn[] = "broadcast_address";
+constexpr char kGatewayParameterThirdPartyVpn[] = "gateway";
+constexpr char kBypassTunnelForIpParameterThirdPartyVpn[] =
+ "bypass_tunnel_for_ip";
+constexpr char kSubnetPrefixParameterThirdPartyVpn[] = "subnet_prefix";
+constexpr char kMtuParameterThirdPartyVpn[] = "mtu";
+constexpr char kDomainSearchParameterThirdPartyVpn[] = "domain_search";
+constexpr char kDnsServersParameterThirdPartyVpn[] = "dns_servers";
+constexpr char kInclusionListParameterThirdPartyVpn[] = "inclusion_list";
+constexpr char kExclusionListParameterThirdPartyVpn[] = "exclusion_list";
+constexpr char kReconnectParameterThirdPartyVpn[] = "reconnect";
+constexpr char kObjectPathBase[] = "/thirdpartyvpn/";
+constexpr char kNonIPDelimiter = ':';
+constexpr char kIPDelimiter = ' ';
// Always-on VPN modes for the kAlwaysOnVpnModeProperty Profile property.
-const char kAlwaysOnVpnModeOff[] = "off";
-const char kAlwaysOnVpnModeBestEffort[] = "best-effort";
-const char kAlwaysOnVpnModeStrict[] = "strict";
+constexpr char kAlwaysOnVpnModeOff[] = "off";
+constexpr char kAlwaysOnVpnModeBestEffort[] = "best-effort";
+constexpr char kAlwaysOnVpnModeStrict[] = "strict";
// Possible traffic sources. Note that these sources should be kept in sync with
// the sources defined in TrafficCounter::Source at:
// src/platform2/system_api/dbus/patchpanel/patchpanel_service.proto
-const char kTrafficCounterSourceUnknown[] = "unknown";
-const char kTrafficCounterSourceChrome[] = "chrome";
-const char kTrafficCounterSourceUser[] = "user";
-const char kTrafficCounterSourceArc[] = "arc";
-const char kTrafficCounterSourceCrosvm[] = "crosvm";
-const char kTrafficCounterSourcePluginvm[] = "pluginvm";
-const char kTrafficCounterSourceUpdateEngine[] = "update_engine";
-const char kTrafficCounterSourceVpn[] = "vpn";
-const char kTrafficCounterSourceSystem[] = "system";
+constexpr char kTrafficCounterSourceUnknown[] = "unknown";
+constexpr char kTrafficCounterSourceChrome[] = "chrome";
+constexpr char kTrafficCounterSourceUser[] = "user";
+constexpr char kTrafficCounterSourceArc[] = "arc";
+constexpr char kTrafficCounterSourceCrosvm[] = "crosvm";
+constexpr char kTrafficCounterSourcePluginvm[] = "pluginvm";
+constexpr char kTrafficCounterSourceUpdateEngine[] = "update_engine";
+constexpr char kTrafficCounterSourceVpn[] = "vpn";
+constexpr char kTrafficCounterSourceSystem[] = "system";
// Manager kTetheringConfigProperty dictionary key names.
-const char kTetheringConfAutoDisableProperty[] = "auto_disable";
-const char kTetheringConfBandProperty[] = "band";
-const char kTetheringConfMARProperty[] = "randomize_mac_address";
-const char kTetheringConfPassphraseProperty[] = "passphrase";
-const char kTetheringConfSecurityProperty[] = "security";
-const char kTetheringConfSSIDProperty[] = "ssid";
-const char kTetheringConfUpstreamTechProperty[] = "upstream_technology";
+constexpr char kTetheringConfAutoDisableProperty[] = "auto_disable";
+constexpr char kTetheringConfBandProperty[] = "band";
+constexpr char kTetheringConfMARProperty[] = "randomize_mac_address";
+constexpr char kTetheringConfPassphraseProperty[] = "passphrase";
+constexpr char kTetheringConfSecurityProperty[] = "security";
+constexpr char kTetheringConfSSIDProperty[] = "ssid";
+constexpr char kTetheringConfUpstreamTechProperty[] = "upstream_technology";
// Manager kTetheringCapabilitiesProperty dictionary key names.
-const char kTetheringCapDownstreamProperty[] = "downstream_technologies";
-const char kTetheringCapSecurityProperty[] = "wifi_security_modes";
-const char kTetheringCapUpstreamProperty[] = "upstream_technologies";
+constexpr char kTetheringCapDownstreamProperty[] = "downstream_technologies";
+constexpr char kTetheringCapSecurityProperty[] = "wifi_security_modes";
+constexpr char kTetheringCapUpstreamProperty[] = "upstream_technologies";
// Manager kTetheringStatusProperty dictionary key names.
-const char kTetheringStatusClientHostnameProperty[] = "hostname";
-const char kTetheringStatusClientIPv4Property[] = "IPv4";
-const char kTetheringStatusClientIPv6Property[] = "IPv6";
-const char kTetheringStatusClientMACProperty[] = "MAC";
-const char kTetheringStatusClientsProperty[] = "active_clients";
-const char kTetheringStatusDownstreamTechProperty[] = "downstream_technology";
-const char kTetheringStatusIdleReasonProperty[] = "idle_reason";
-const char kTetheringStatusStateProperty[] = "state";
-const char kTetheringStatusUpstreamTechProperty[] = "upstream_technology";
-const char kTetheringStatusUpstreamServiceProperty[] = "upstream_service";
+constexpr char kTetheringStatusClientHostnameProperty[] = "hostname";
+constexpr char kTetheringStatusClientIPv4Property[] = "IPv4";
+constexpr char kTetheringStatusClientIPv6Property[] = "IPv6";
+constexpr char kTetheringStatusClientMACProperty[] = "MAC";
+constexpr char kTetheringStatusClientsProperty[] = "active_clients";
+constexpr char kTetheringStatusDownstreamTechProperty[] =
+ "downstream_technology";
+constexpr char kTetheringStatusIdleReasonProperty[] = "idle_reason";
+constexpr char kTetheringStatusStateProperty[] = "state";
+constexpr char kTetheringStatusUpstreamTechProperty[] = "upstream_technology";
+constexpr char kTetheringStatusUpstreamServiceProperty[] = "upstream_service";
// kTetheringStatusIdleReasonProperty values
-const char kTetheringIdleReasonClientStop[] = "client_stop";
-const char kTetheringIdleReasonError[] = "error";
-const char kTetheringIdleReasonInactive[] = "inactive";
-const char kTetheringIdleReasonInitialState[] = "initial_state";
-const char kTetheringIdleReasonSuspend[] = "suspend";
-const char kTetheringIdleReasonUpstreamDisconnect[] = "upstream_disconnect";
-const char kTetheringIdleReasonUserExit[] = "user_exit";
+constexpr char kTetheringIdleReasonClientStop[] = "client_stop";
+constexpr char kTetheringIdleReasonError[] = "error";
+constexpr char kTetheringIdleReasonInactive[] = "inactive";
+constexpr char kTetheringIdleReasonInitialState[] = "initial_state";
+constexpr char kTetheringIdleReasonSuspend[] = "suspend";
+constexpr char kTetheringIdleReasonUpstreamDisconnect[] = "upstream_disconnect";
+constexpr char kTetheringIdleReasonUserExit[] = "user_exit";
// kTetheringStatusStateProperty values
-const char kTetheringStateActive[] = "active";
-const char kTetheringStateIdle[] = "idle";
-const char kTetheringStateStarting[] = "starting";
-const char kTetheringStateStopping[] = "stopping";
+constexpr char kTetheringStateActive[] = "active";
+constexpr char kTetheringStateIdle[] = "idle";
+constexpr char kTetheringStateStarting[] = "starting";
+constexpr char kTetheringStateStopping[] = "stopping";
// SetTetheringEnabled result values
-const char kTetheringEnableResultDownstreamWiFiFailure[] =
+constexpr char kTetheringEnableResultDownstreamWiFiFailure[] =
"downstream_wifi_failure";
-const char kTetheringEnableResultFailure[] = "failure";
-const char kTetheringEnableResultInvalidProperties[] = "invalid_properties";
-const char kTetheringEnableResultNetworkSetupFailure[] =
+constexpr char kTetheringEnableResultFailure[] = "failure";
+constexpr char kTetheringEnableResultInvalidProperties[] = "invalid_properties";
+constexpr char kTetheringEnableResultNetworkSetupFailure[] =
"network_setup_failure";
-const char kTetheringEnableResultNotAllowed[] = "not_allowed";
-const char kTetheringEnableResultSuccess[] = "success";
-const char kTetheringEnableResultUpstreamFailure[] = "upstream_failure";
-const char kTetheringEnableResultUpstreamNotAvailable[] =
+constexpr char kTetheringEnableResultNotAllowed[] = "not_allowed";
+constexpr char kTetheringEnableResultSuccess[] = "success";
+constexpr char kTetheringEnableResultUpstreamFailure[] = "upstream_failure";
+constexpr char kTetheringEnableResultUpstreamNotAvailable[] =
"upstream_not_available";
-const char kTetheringEnableResultWrongState[] = "wrong_state";
+constexpr char kTetheringEnableResultWrongState[] = "wrong_state";
// kCheckTetheringReadinessFunction return status
-const char kTetheringReadinessNotAllowed[] = "not_allowed";
-const char kTetheringReadinessReady[] = "ready";
-const char kTetheringReadinessUpstreamNetworkNotAvailable[] =
+constexpr char kTetheringReadinessNotAllowed[] = "not_allowed";
+constexpr char kTetheringReadinessReady[] = "ready";
+constexpr char kTetheringReadinessUpstreamNetworkNotAvailable[] =
"upstream_network_not_available";
} // namespace shill
diff --git a/chroot/build/amd64-generic/usr/include/vm_concierge/concierge_service.pb.h b/chroot/build/amd64-generic/usr/include/vm_concierge/concierge_service.pb.h
index 3ac27b5..e053ac4 100644
--- a/chroot/build/amd64-generic/usr/include/vm_concierge/concierge_service.pb.h
+++ b/chroot/build/amd64-generic/usr/include/vm_concierge/concierge_service.pb.h
@@ -1825,7 +1825,6 @@
kKernelParamsFieldNumber = 17,
kFeaturesFieldNumber = 21,
kOemStringsFieldNumber = 24,
- kSharedDirectoryFieldNumber = 3,
kNameFieldNumber = 4,
kOwnerIdFieldNumber = 7,
kVmUsernameFieldNumber = 26,
@@ -1946,20 +1945,6 @@
std::string* _internal_add_oem_strings();
public:
- // string shared_directory = 3 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_shared_directory();
- PROTOBUF_DEPRECATED const std::string& shared_directory() const;
- template <typename ArgT0 = const std::string&, typename... ArgT>
- PROTOBUF_DEPRECATED void set_shared_directory(ArgT0&& arg0, ArgT... args);
- PROTOBUF_DEPRECATED std::string* mutable_shared_directory();
- PROTOBUF_NODISCARD PROTOBUF_DEPRECATED std::string* release_shared_directory();
- PROTOBUF_DEPRECATED void set_allocated_shared_directory(std::string* shared_directory);
- private:
- const std::string& _internal_shared_directory() const;
- inline PROTOBUF_ALWAYS_INLINE void _internal_set_shared_directory(const std::string& value);
- std::string* _internal_mutable_shared_directory();
- public:
-
// string name = 4;
void clear_name();
const std::string& name() const;
@@ -2170,7 +2155,6 @@
::PROTOBUF_NAMESPACE_ID::RepeatedField<int> features_;
mutable std::atomic<int> _features_cached_byte_size_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> oem_strings_;
- ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr shared_directory_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr owner_id_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr vm_username_;
@@ -2663,7 +2647,6 @@
enum : int {
kDisksFieldNumber = 2,
- kParamsFieldNumber = 5,
kNameFieldNumber = 3,
kOwnerIdFieldNumber = 4,
kFstabFieldNumber = 6,
@@ -2676,33 +2659,24 @@
kUseHugepagesFieldNumber = 11,
kMemoryMibFieldNumber = 12,
kRootfsBlockSizeFieldNumber = 15,
- kUsePerVmCoreSchedulingFieldNumber = 14,
- kEnableConsumerAutoUpdateToggleFieldNumber = 16,
- kLockGuestMemoryFieldNumber = 18,
- kEnableArcFilePickerExperimentFieldNumber = 19,
kPanelOrientationFieldNumber = 17,
- kEnableCustomTabsExperimentFieldNumber = 20,
+ kUsePerVmCoreSchedulingFieldNumber = 14,
+ kLockGuestMemoryFieldNumber = 18,
kEnableKeyboardShortcutHelperIntegrationFieldNumber = 21,
- kEnableNotificationsRefreshFieldNumber = 22,
- kEnableTtsCachingFieldNumber = 23,
- kLogdConfigSizeFieldNumber = 26,
- kEnableGmscoreLmkProtectionFieldNumber = 24,
kEnableBroadcastAnrPrenotifyFieldNumber = 25,
- kEnableVirtioBlkDataFieldNumber = 27,
- kDisableMediaStoreMaintenanceFieldNumber = 29,
+ kLogdConfigSizeFieldNumber = 26,
kVmMemoryPsiPeriodFieldNumber = 28,
kGuestZramSizeFieldNumber = 32,
kGuestSwappinessFieldNumber = 33,
- kArcGeneratePlayAutoInstallFieldNumber = 30,
- kDisableDownloadProviderFieldNumber = 31,
- kUpdateO4CListViaA2C2FieldNumber = 37,
- kEnableRwFieldNumber = 41,
kMglruReclaimIntervalFieldNumber = 35,
kMglruReclaimSwappinessFieldNumber = 36,
+ kEnableVirtioBlkDataFieldNumber = 27,
+ kUpdateO4CListViaA2C2FieldNumber = 37,
+ kEnableRwFieldNumber = 41,
+ kEnableWebViewZygoteLazyInitFieldNumber = 42,
kUsapProfileFieldNumber = 38,
kNativeBridgeExperimentFieldNumber = 39,
kUreadaheadModeFieldNumber = 40,
- kEnableWebViewZygoteLazyInitFieldNumber = 42,
kEnableVmmSwapFieldNumber = 43,
};
// repeated .vm_tools.concierge.DiskImage disks = 2;
@@ -2723,30 +2697,6 @@
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::vm_tools::concierge::DiskImage >&
disks() const;
- // repeated string params = 5 [deprecated = true];
- PROTOBUF_DEPRECATED int params_size() const;
- private:
- int _internal_params_size() const;
- public:
- PROTOBUF_DEPRECATED void clear_params();
- PROTOBUF_DEPRECATED const std::string& params(int index) const;
- PROTOBUF_DEPRECATED std::string* mutable_params(int index);
- PROTOBUF_DEPRECATED void set_params(int index, const std::string& value);
- PROTOBUF_DEPRECATED void set_params(int index, std::string&& value);
- PROTOBUF_DEPRECATED void set_params(int index, const char* value);
- PROTOBUF_DEPRECATED void set_params(int index, const char* value, size_t size);
- PROTOBUF_DEPRECATED std::string* add_params();
- PROTOBUF_DEPRECATED void add_params(const std::string& value);
- PROTOBUF_DEPRECATED void add_params(std::string&& value);
- PROTOBUF_DEPRECATED void add_params(const char* value);
- PROTOBUF_DEPRECATED void add_params(const char* value, size_t size);
- PROTOBUF_DEPRECATED const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& params() const;
- PROTOBUF_DEPRECATED ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_params();
- private:
- const std::string& _internal_params(int index) const;
- std::string* _internal_add_params();
- public:
-
// string name = 3;
void clear_name();
const std::string& name() const;
@@ -2888,6 +2838,15 @@
void _internal_set_rootfs_block_size(uint32_t value);
public:
+ // .vm_tools.concierge.StartArcVmRequest.DisplayOrientation panel_orientation = 17;
+ void clear_panel_orientation();
+ ::vm_tools::concierge::StartArcVmRequest_DisplayOrientation panel_orientation() const;
+ void set_panel_orientation(::vm_tools::concierge::StartArcVmRequest_DisplayOrientation value);
+ private:
+ ::vm_tools::concierge::StartArcVmRequest_DisplayOrientation _internal_panel_orientation() const;
+ void _internal_set_panel_orientation(::vm_tools::concierge::StartArcVmRequest_DisplayOrientation value);
+ public:
+
// bool use_per_vm_core_scheduling = 14;
void clear_use_per_vm_core_scheduling();
bool use_per_vm_core_scheduling() const;
@@ -2897,15 +2856,6 @@
void _internal_set_use_per_vm_core_scheduling(bool value);
public:
- // bool enable_consumer_auto_update_toggle = 16 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_consumer_auto_update_toggle();
- PROTOBUF_DEPRECATED bool enable_consumer_auto_update_toggle() const;
- PROTOBUF_DEPRECATED void set_enable_consumer_auto_update_toggle(bool value);
- private:
- bool _internal_enable_consumer_auto_update_toggle() const;
- void _internal_set_enable_consumer_auto_update_toggle(bool value);
- public:
-
// bool lock_guest_memory = 18;
void clear_lock_guest_memory();
bool lock_guest_memory() const;
@@ -2915,33 +2865,6 @@
void _internal_set_lock_guest_memory(bool value);
public:
- // bool enable_arc_file_picker_experiment = 19 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_arc_file_picker_experiment();
- PROTOBUF_DEPRECATED bool enable_arc_file_picker_experiment() const;
- PROTOBUF_DEPRECATED void set_enable_arc_file_picker_experiment(bool value);
- private:
- bool _internal_enable_arc_file_picker_experiment() const;
- void _internal_set_enable_arc_file_picker_experiment(bool value);
- public:
-
- // .vm_tools.concierge.StartArcVmRequest.DisplayOrientation panel_orientation = 17;
- void clear_panel_orientation();
- ::vm_tools::concierge::StartArcVmRequest_DisplayOrientation panel_orientation() const;
- void set_panel_orientation(::vm_tools::concierge::StartArcVmRequest_DisplayOrientation value);
- private:
- ::vm_tools::concierge::StartArcVmRequest_DisplayOrientation _internal_panel_orientation() const;
- void _internal_set_panel_orientation(::vm_tools::concierge::StartArcVmRequest_DisplayOrientation value);
- public:
-
- // bool enable_custom_tabs_experiment = 20 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_custom_tabs_experiment();
- PROTOBUF_DEPRECATED bool enable_custom_tabs_experiment() const;
- PROTOBUF_DEPRECATED void set_enable_custom_tabs_experiment(bool value);
- private:
- bool _internal_enable_custom_tabs_experiment() const;
- void _internal_set_enable_custom_tabs_experiment(bool value);
- public:
-
// bool enable_keyboard_shortcut_helper_integration = 21;
void clear_enable_keyboard_shortcut_helper_integration();
bool enable_keyboard_shortcut_helper_integration() const;
@@ -2951,42 +2874,6 @@
void _internal_set_enable_keyboard_shortcut_helper_integration(bool value);
public:
- // bool enable_notifications_refresh = 22 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_notifications_refresh();
- PROTOBUF_DEPRECATED bool enable_notifications_refresh() const;
- PROTOBUF_DEPRECATED void set_enable_notifications_refresh(bool value);
- private:
- bool _internal_enable_notifications_refresh() const;
- void _internal_set_enable_notifications_refresh(bool value);
- public:
-
- // bool enable_tts_caching = 23 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_tts_caching();
- PROTOBUF_DEPRECATED bool enable_tts_caching() const;
- PROTOBUF_DEPRECATED void set_enable_tts_caching(bool value);
- private:
- bool _internal_enable_tts_caching() const;
- void _internal_set_enable_tts_caching(bool value);
- public:
-
- // int32 logd_config_size = 26 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_logd_config_size();
- PROTOBUF_DEPRECATED int32_t logd_config_size() const;
- PROTOBUF_DEPRECATED void set_logd_config_size(int32_t value);
- private:
- int32_t _internal_logd_config_size() const;
- void _internal_set_logd_config_size(int32_t value);
- public:
-
- // bool enable_gmscore_lmk_protection = 24 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_enable_gmscore_lmk_protection();
- PROTOBUF_DEPRECATED bool enable_gmscore_lmk_protection() const;
- PROTOBUF_DEPRECATED void set_enable_gmscore_lmk_protection(bool value);
- private:
- bool _internal_enable_gmscore_lmk_protection() const;
- void _internal_set_enable_gmscore_lmk_protection(bool value);
- public:
-
// bool enable_broadcast_anr_prenotify = 25;
void clear_enable_broadcast_anr_prenotify();
bool enable_broadcast_anr_prenotify() const;
@@ -2996,22 +2883,13 @@
void _internal_set_enable_broadcast_anr_prenotify(bool value);
public:
- // bool enable_virtio_blk_data = 27;
- void clear_enable_virtio_blk_data();
- bool enable_virtio_blk_data() const;
- void set_enable_virtio_blk_data(bool value);
+ // int32 logd_config_size = 26 [deprecated = true];
+ PROTOBUF_DEPRECATED void clear_logd_config_size();
+ PROTOBUF_DEPRECATED int32_t logd_config_size() const;
+ PROTOBUF_DEPRECATED void set_logd_config_size(int32_t value);
private:
- bool _internal_enable_virtio_blk_data() const;
- void _internal_set_enable_virtio_blk_data(bool value);
- public:
-
- // bool disable_media_store_maintenance = 29 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_disable_media_store_maintenance();
- PROTOBUF_DEPRECATED bool disable_media_store_maintenance() const;
- PROTOBUF_DEPRECATED void set_disable_media_store_maintenance(bool value);
- private:
- bool _internal_disable_media_store_maintenance() const;
- void _internal_set_disable_media_store_maintenance(bool value);
+ int32_t _internal_logd_config_size() const;
+ void _internal_set_logd_config_size(int32_t value);
public:
// int32 vm_memory_psi_period = 28;
@@ -3041,22 +2919,31 @@
void _internal_set_guest_swappiness(int32_t value);
public:
- // bool arc_generate_play_auto_install = 30 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_arc_generate_play_auto_install();
- PROTOBUF_DEPRECATED bool arc_generate_play_auto_install() const;
- PROTOBUF_DEPRECATED void set_arc_generate_play_auto_install(bool value);
+ // int32 mglru_reclaim_interval = 35;
+ void clear_mglru_reclaim_interval();
+ int32_t mglru_reclaim_interval() const;
+ void set_mglru_reclaim_interval(int32_t value);
private:
- bool _internal_arc_generate_play_auto_install() const;
- void _internal_set_arc_generate_play_auto_install(bool value);
+ int32_t _internal_mglru_reclaim_interval() const;
+ void _internal_set_mglru_reclaim_interval(int32_t value);
public:
- // bool disable_download_provider = 31 [deprecated = true];
- PROTOBUF_DEPRECATED void clear_disable_download_provider();
- PROTOBUF_DEPRECATED bool disable_download_provider() const;
- PROTOBUF_DEPRECATED void set_disable_download_provider(bool value);
+ // int32 mglru_reclaim_swappiness = 36;
+ void clear_mglru_reclaim_swappiness();
+ int32_t mglru_reclaim_swappiness() const;
+ void set_mglru_reclaim_swappiness(int32_t value);
private:
- bool _internal_disable_download_provider() const;
- void _internal_set_disable_download_provider(bool value);
+ int32_t _internal_mglru_reclaim_swappiness() const;
+ void _internal_set_mglru_reclaim_swappiness(int32_t value);
+ public:
+
+ // bool enable_virtio_blk_data = 27;
+ void clear_enable_virtio_blk_data();
+ bool enable_virtio_blk_data() const;
+ void set_enable_virtio_blk_data(bool value);
+ private:
+ bool _internal_enable_virtio_blk_data() const;
+ void _internal_set_enable_virtio_blk_data(bool value);
public:
// bool update_o4c_list_via_a2c2 = 37 [deprecated = true];
@@ -3077,22 +2964,13 @@
void _internal_set_enable_rw(bool value);
public:
- // int32 mglru_reclaim_interval = 35;
- void clear_mglru_reclaim_interval();
- int32_t mglru_reclaim_interval() const;
- void set_mglru_reclaim_interval(int32_t value);
+ // bool enable_web_view_zygote_lazy_init = 42;
+ void clear_enable_web_view_zygote_lazy_init();
+ bool enable_web_view_zygote_lazy_init() const;
+ void set_enable_web_view_zygote_lazy_init(bool value);
private:
- int32_t _internal_mglru_reclaim_interval() const;
- void _internal_set_mglru_reclaim_interval(int32_t value);
- public:
-
- // int32 mglru_reclaim_swappiness = 36;
- void clear_mglru_reclaim_swappiness();
- int32_t mglru_reclaim_swappiness() const;
- void set_mglru_reclaim_swappiness(int32_t value);
- private:
- int32_t _internal_mglru_reclaim_swappiness() const;
- void _internal_set_mglru_reclaim_swappiness(int32_t value);
+ bool _internal_enable_web_view_zygote_lazy_init() const;
+ void _internal_set_enable_web_view_zygote_lazy_init(bool value);
public:
// .vm_tools.concierge.StartArcVmRequest.UsapProfileType usap_profile = 38;
@@ -3122,15 +3000,6 @@
void _internal_set_ureadahead_mode(::vm_tools::concierge::StartArcVmRequest_UreadaheadMode value);
public:
- // bool enable_web_view_zygote_lazy_init = 42;
- void clear_enable_web_view_zygote_lazy_init();
- bool enable_web_view_zygote_lazy_init() const;
- void set_enable_web_view_zygote_lazy_init(bool value);
- private:
- bool _internal_enable_web_view_zygote_lazy_init() const;
- void _internal_set_enable_web_view_zygote_lazy_init(bool value);
- public:
-
// bool enable_vmm_swap = 43;
void clear_enable_vmm_swap();
bool enable_vmm_swap() const;
@@ -3149,7 +3018,6 @@
typedef void DestructorSkippable_;
struct Impl_ {
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::vm_tools::concierge::DiskImage > disks_;
- ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> params_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr owner_id_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fstab_;
@@ -3162,33 +3030,24 @@
bool use_hugepages_;
uint32_t memory_mib_;
uint32_t rootfs_block_size_;
- bool use_per_vm_core_scheduling_;
- bool enable_consumer_auto_update_toggle_;
- bool lock_guest_memory_;
- bool enable_arc_file_picker_experiment_;
int panel_orientation_;
- bool enable_custom_tabs_experiment_;
+ bool use_per_vm_core_scheduling_;
+ bool lock_guest_memory_;
bool enable_keyboard_shortcut_helper_integration_;
- bool enable_notifications_refresh_;
- bool enable_tts_caching_;
- int32_t logd_config_size_;
- bool enable_gmscore_lmk_protection_;
bool enable_broadcast_anr_prenotify_;
- bool enable_virtio_blk_data_;
- bool disable_media_store_maintenance_;
+ int32_t logd_config_size_;
int32_t vm_memory_psi_period_;
int32_t guest_zram_size_;
int32_t guest_swappiness_;
- bool arc_generate_play_auto_install_;
- bool disable_download_provider_;
- bool update_o4c_list_via_a2c2_;
- bool enable_rw_;
int32_t mglru_reclaim_interval_;
int32_t mglru_reclaim_swappiness_;
+ bool enable_virtio_blk_data_;
+ bool update_o4c_list_via_a2c2_;
+ bool enable_rw_;
+ bool enable_web_view_zygote_lazy_init_;
int usap_profile_;
int native_bridge_experiment_;
int ureadahead_mode_;
- bool enable_web_view_zygote_lazy_init_;
bool enable_vmm_swap_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
};
@@ -15041,56 +14900,6 @@
return _impl_.disks_;
}
-// string shared_directory = 3 [deprecated = true];
-inline void StartVmRequest::clear_shared_directory() {
- _impl_.shared_directory_.ClearToEmpty();
-}
-inline const std::string& StartVmRequest::shared_directory() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartVmRequest.shared_directory)
- return _internal_shared_directory();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void StartVmRequest::set_shared_directory(ArgT0&& arg0, ArgT... args) {
-
- _impl_.shared_directory_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartVmRequest.shared_directory)
-}
-inline std::string* StartVmRequest::mutable_shared_directory() {
- std::string* _s = _internal_mutable_shared_directory();
- // @@protoc_insertion_point(field_mutable:vm_tools.concierge.StartVmRequest.shared_directory)
- return _s;
-}
-inline const std::string& StartVmRequest::_internal_shared_directory() const {
- return _impl_.shared_directory_.Get();
-}
-inline void StartVmRequest::_internal_set_shared_directory(const std::string& value) {
-
- _impl_.shared_directory_.Set(value, GetArenaForAllocation());
-}
-inline std::string* StartVmRequest::_internal_mutable_shared_directory() {
-
- return _impl_.shared_directory_.Mutable(GetArenaForAllocation());
-}
-inline std::string* StartVmRequest::release_shared_directory() {
- // @@protoc_insertion_point(field_release:vm_tools.concierge.StartVmRequest.shared_directory)
- return _impl_.shared_directory_.Release();
-}
-inline void StartVmRequest::set_allocated_shared_directory(std::string* shared_directory) {
- if (shared_directory != nullptr) {
-
- } else {
-
- }
- _impl_.shared_directory_.SetAllocated(shared_directory, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
- if (_impl_.shared_directory_.IsDefault()) {
- _impl_.shared_directory_.Set("", GetArenaForAllocation());
- }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
- // @@protoc_insertion_point(field_set_allocated:vm_tools.concierge.StartVmRequest.shared_directory)
-}
-
// string name = 4;
inline void StartVmRequest::clear_name() {
_impl_.name_.ClearToEmpty();
@@ -16390,81 +16199,6 @@
// @@protoc_insertion_point(field_set_allocated:vm_tools.concierge.StartArcVmRequest.owner_id)
}
-// repeated string params = 5 [deprecated = true];
-inline int StartArcVmRequest::_internal_params_size() const {
- return _impl_.params_.size();
-}
-inline int StartArcVmRequest::params_size() const {
- return _internal_params_size();
-}
-inline void StartArcVmRequest::clear_params() {
- _impl_.params_.Clear();
-}
-inline std::string* StartArcVmRequest::add_params() {
- std::string* _s = _internal_add_params();
- // @@protoc_insertion_point(field_add_mutable:vm_tools.concierge.StartArcVmRequest.params)
- return _s;
-}
-inline const std::string& StartArcVmRequest::_internal_params(int index) const {
- return _impl_.params_.Get(index);
-}
-inline const std::string& StartArcVmRequest::params(int index) const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.params)
- return _internal_params(index);
-}
-inline std::string* StartArcVmRequest::mutable_params(int index) {
- // @@protoc_insertion_point(field_mutable:vm_tools.concierge.StartArcVmRequest.params)
- return _impl_.params_.Mutable(index);
-}
-inline void StartArcVmRequest::set_params(int index, const std::string& value) {
- _impl_.params_.Mutable(index)->assign(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::set_params(int index, std::string&& value) {
- _impl_.params_.Mutable(index)->assign(std::move(value));
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::set_params(int index, const char* value) {
- GOOGLE_DCHECK(value != nullptr);
- _impl_.params_.Mutable(index)->assign(value);
- // @@protoc_insertion_point(field_set_char:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::set_params(int index, const char* value, size_t size) {
- _impl_.params_.Mutable(index)->assign(
- reinterpret_cast<const char*>(value), size);
- // @@protoc_insertion_point(field_set_pointer:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline std::string* StartArcVmRequest::_internal_add_params() {
- return _impl_.params_.Add();
-}
-inline void StartArcVmRequest::add_params(const std::string& value) {
- _impl_.params_.Add()->assign(value);
- // @@protoc_insertion_point(field_add:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::add_params(std::string&& value) {
- _impl_.params_.Add(std::move(value));
- // @@protoc_insertion_point(field_add:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::add_params(const char* value) {
- GOOGLE_DCHECK(value != nullptr);
- _impl_.params_.Add()->assign(value);
- // @@protoc_insertion_point(field_add_char:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline void StartArcVmRequest::add_params(const char* value, size_t size) {
- _impl_.params_.Add()->assign(reinterpret_cast<const char*>(value), size);
- // @@protoc_insertion_point(field_add_pointer:vm_tools.concierge.StartArcVmRequest.params)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-StartArcVmRequest::params() const {
- // @@protoc_insertion_point(field_list:vm_tools.concierge.StartArcVmRequest.params)
- return _impl_.params_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-StartArcVmRequest::mutable_params() {
- // @@protoc_insertion_point(field_mutable_list:vm_tools.concierge.StartArcVmRequest.params)
- return &_impl_.params_;
-}
-
// string fstab = 6;
inline void StartArcVmRequest::clear_fstab() {
_impl_.fstab_.ClearToEmpty();
@@ -16675,26 +16409,6 @@
// @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.rootfs_block_size)
}
-// bool enable_consumer_auto_update_toggle = 16 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_consumer_auto_update_toggle() {
- _impl_.enable_consumer_auto_update_toggle_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_consumer_auto_update_toggle() const {
- return _impl_.enable_consumer_auto_update_toggle_;
-}
-inline bool StartArcVmRequest::enable_consumer_auto_update_toggle() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_consumer_auto_update_toggle)
- return _internal_enable_consumer_auto_update_toggle();
-}
-inline void StartArcVmRequest::_internal_set_enable_consumer_auto_update_toggle(bool value) {
-
- _impl_.enable_consumer_auto_update_toggle_ = value;
-}
-inline void StartArcVmRequest::set_enable_consumer_auto_update_toggle(bool value) {
- _internal_set_enable_consumer_auto_update_toggle(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_consumer_auto_update_toggle)
-}
-
// .vm_tools.concierge.StartArcVmRequest.DisplayOrientation panel_orientation = 17;
inline void StartArcVmRequest::clear_panel_orientation() {
_impl_.panel_orientation_ = 0;
@@ -16735,46 +16449,6 @@
// @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.lock_guest_memory)
}
-// bool enable_arc_file_picker_experiment = 19 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_arc_file_picker_experiment() {
- _impl_.enable_arc_file_picker_experiment_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_arc_file_picker_experiment() const {
- return _impl_.enable_arc_file_picker_experiment_;
-}
-inline bool StartArcVmRequest::enable_arc_file_picker_experiment() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_arc_file_picker_experiment)
- return _internal_enable_arc_file_picker_experiment();
-}
-inline void StartArcVmRequest::_internal_set_enable_arc_file_picker_experiment(bool value) {
-
- _impl_.enable_arc_file_picker_experiment_ = value;
-}
-inline void StartArcVmRequest::set_enable_arc_file_picker_experiment(bool value) {
- _internal_set_enable_arc_file_picker_experiment(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_arc_file_picker_experiment)
-}
-
-// bool enable_custom_tabs_experiment = 20 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_custom_tabs_experiment() {
- _impl_.enable_custom_tabs_experiment_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_custom_tabs_experiment() const {
- return _impl_.enable_custom_tabs_experiment_;
-}
-inline bool StartArcVmRequest::enable_custom_tabs_experiment() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_custom_tabs_experiment)
- return _internal_enable_custom_tabs_experiment();
-}
-inline void StartArcVmRequest::_internal_set_enable_custom_tabs_experiment(bool value) {
-
- _impl_.enable_custom_tabs_experiment_ = value;
-}
-inline void StartArcVmRequest::set_enable_custom_tabs_experiment(bool value) {
- _internal_set_enable_custom_tabs_experiment(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_custom_tabs_experiment)
-}
-
// bool enable_keyboard_shortcut_helper_integration = 21;
inline void StartArcVmRequest::clear_enable_keyboard_shortcut_helper_integration() {
_impl_.enable_keyboard_shortcut_helper_integration_ = false;
@@ -16795,66 +16469,6 @@
// @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_keyboard_shortcut_helper_integration)
}
-// bool enable_notifications_refresh = 22 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_notifications_refresh() {
- _impl_.enable_notifications_refresh_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_notifications_refresh() const {
- return _impl_.enable_notifications_refresh_;
-}
-inline bool StartArcVmRequest::enable_notifications_refresh() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_notifications_refresh)
- return _internal_enable_notifications_refresh();
-}
-inline void StartArcVmRequest::_internal_set_enable_notifications_refresh(bool value) {
-
- _impl_.enable_notifications_refresh_ = value;
-}
-inline void StartArcVmRequest::set_enable_notifications_refresh(bool value) {
- _internal_set_enable_notifications_refresh(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_notifications_refresh)
-}
-
-// bool enable_tts_caching = 23 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_tts_caching() {
- _impl_.enable_tts_caching_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_tts_caching() const {
- return _impl_.enable_tts_caching_;
-}
-inline bool StartArcVmRequest::enable_tts_caching() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_tts_caching)
- return _internal_enable_tts_caching();
-}
-inline void StartArcVmRequest::_internal_set_enable_tts_caching(bool value) {
-
- _impl_.enable_tts_caching_ = value;
-}
-inline void StartArcVmRequest::set_enable_tts_caching(bool value) {
- _internal_set_enable_tts_caching(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_tts_caching)
-}
-
-// bool enable_gmscore_lmk_protection = 24 [deprecated = true];
-inline void StartArcVmRequest::clear_enable_gmscore_lmk_protection() {
- _impl_.enable_gmscore_lmk_protection_ = false;
-}
-inline bool StartArcVmRequest::_internal_enable_gmscore_lmk_protection() const {
- return _impl_.enable_gmscore_lmk_protection_;
-}
-inline bool StartArcVmRequest::enable_gmscore_lmk_protection() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.enable_gmscore_lmk_protection)
- return _internal_enable_gmscore_lmk_protection();
-}
-inline void StartArcVmRequest::_internal_set_enable_gmscore_lmk_protection(bool value) {
-
- _impl_.enable_gmscore_lmk_protection_ = value;
-}
-inline void StartArcVmRequest::set_enable_gmscore_lmk_protection(bool value) {
- _internal_set_enable_gmscore_lmk_protection(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.enable_gmscore_lmk_protection)
-}
-
// bool enable_broadcast_anr_prenotify = 25;
inline void StartArcVmRequest::clear_enable_broadcast_anr_prenotify() {
_impl_.enable_broadcast_anr_prenotify_ = false;
@@ -16935,66 +16549,6 @@
// @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.vm_memory_psi_period)
}
-// bool disable_media_store_maintenance = 29 [deprecated = true];
-inline void StartArcVmRequest::clear_disable_media_store_maintenance() {
- _impl_.disable_media_store_maintenance_ = false;
-}
-inline bool StartArcVmRequest::_internal_disable_media_store_maintenance() const {
- return _impl_.disable_media_store_maintenance_;
-}
-inline bool StartArcVmRequest::disable_media_store_maintenance() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.disable_media_store_maintenance)
- return _internal_disable_media_store_maintenance();
-}
-inline void StartArcVmRequest::_internal_set_disable_media_store_maintenance(bool value) {
-
- _impl_.disable_media_store_maintenance_ = value;
-}
-inline void StartArcVmRequest::set_disable_media_store_maintenance(bool value) {
- _internal_set_disable_media_store_maintenance(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.disable_media_store_maintenance)
-}
-
-// bool arc_generate_play_auto_install = 30 [deprecated = true];
-inline void StartArcVmRequest::clear_arc_generate_play_auto_install() {
- _impl_.arc_generate_play_auto_install_ = false;
-}
-inline bool StartArcVmRequest::_internal_arc_generate_play_auto_install() const {
- return _impl_.arc_generate_play_auto_install_;
-}
-inline bool StartArcVmRequest::arc_generate_play_auto_install() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.arc_generate_play_auto_install)
- return _internal_arc_generate_play_auto_install();
-}
-inline void StartArcVmRequest::_internal_set_arc_generate_play_auto_install(bool value) {
-
- _impl_.arc_generate_play_auto_install_ = value;
-}
-inline void StartArcVmRequest::set_arc_generate_play_auto_install(bool value) {
- _internal_set_arc_generate_play_auto_install(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.arc_generate_play_auto_install)
-}
-
-// bool disable_download_provider = 31 [deprecated = true];
-inline void StartArcVmRequest::clear_disable_download_provider() {
- _impl_.disable_download_provider_ = false;
-}
-inline bool StartArcVmRequest::_internal_disable_download_provider() const {
- return _impl_.disable_download_provider_;
-}
-inline bool StartArcVmRequest::disable_download_provider() const {
- // @@protoc_insertion_point(field_get:vm_tools.concierge.StartArcVmRequest.disable_download_provider)
- return _internal_disable_download_provider();
-}
-inline void StartArcVmRequest::_internal_set_disable_download_provider(bool value) {
-
- _impl_.disable_download_provider_ = value;
-}
-inline void StartArcVmRequest::set_disable_download_provider(bool value) {
- _internal_set_disable_download_provider(value);
- // @@protoc_insertion_point(field_set:vm_tools.concierge.StartArcVmRequest.disable_download_provider)
-}
-
// int32 guest_zram_size = 32;
inline void StartArcVmRequest::clear_guest_zram_size() {
_impl_.guest_zram_size_ = 0;
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
index d6de77a..4000119 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
@@ -145,9 +145,10 @@
uint8_t blur_enabled : 1;
uint8_t replace_enabled : 1;
uint8_t relight_enabled : 1;
- uint8_t pad6_[1];
+ uint8_t light_intensity_$flag : 1;
+ uint8_t pad7_[1];
int32_t segmentation_model;
- uint8_t pad7_[4];
+ float light_intensity_$value;
mojo::internal::Pointer<::mojo_base::mojom::internal::RelativeFilePath_Data> background_filepath;
private:
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc
index a6e82a4..725653d 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc
@@ -149,6 +149,7 @@
{ 1, 24 },
{ 2, 32 },
{ 3, 40 },
+ { 4, 40 },
};
if (!ValidateStructHeaderAndVersionSizeAndClaimMemory(
data, kVersionSizes, validation_context)) {
@@ -191,7 +192,7 @@
}
EffectsConfig_Data::EffectsConfig_Data()
- : header_({sizeof(*this), 3}) {}
+ : header_({sizeof(*this), 4}) {}
} // namespace internal
} // namespace mojom
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h
index 76668cd..b3ad816 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h
@@ -261,6 +261,15 @@
return mojo::internal::Deserialize<::mojo_base::mojom::RelativeFilePathDataView>(
pointer, output, message_);
}
+ absl::optional<float> light_intensity() const {
+ if (data_->header_.version < 4) {
+ return absl::nullopt;
+ }
+
+ return data_->light_intensity_$flag
+ ? absl::make_optional(data_->light_intensity_$value)
+ : absl::nullopt;
+ }
private:
internal::EffectsConfig_Data* data_ = nullptr;
mojo::Message* message_ = nullptr;
@@ -406,6 +415,10 @@
in_background_filepath, background_filepath_fragment);
fragment->background_filepath.Set(
background_filepath_fragment.is_null() ? nullptr : background_filepath_fragment.data());
+ fragment->light_intensity_$flag = Traits::light_intensity(input).has_value();
+ if (Traits::light_intensity(input).has_value()) {
+ fragment->light_intensity_$value = Traits::light_intensity(input).value();
+ }
}
static bool Deserialize(::cros::mojom::internal::EffectsConfig_Data* input,
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc
index b2390ec..afaa1b5 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc
@@ -54,7 +54,8 @@
replace_enabled(),
relight_enabled(),
segmentation_model(),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -69,7 +70,8 @@
replace_enabled(),
relight_enabled(),
segmentation_model(),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -87,7 +89,8 @@
replace_enabled(std::move(replace_enabled_in)),
relight_enabled(std::move(relight_enabled_in)),
segmentation_model(),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -106,7 +109,8 @@
replace_enabled(std::move(replace_enabled_in)),
relight_enabled(std::move(relight_enabled_in)),
segmentation_model(std::move(segmentation_model_in)),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -126,7 +130,30 @@
replace_enabled(std::move(replace_enabled_in)),
relight_enabled(std::move(relight_enabled_in)),
segmentation_model(std::move(segmentation_model_in)),
- background_filepath(std::move(background_filepath_in)) {}
+ background_filepath(std::move(background_filepath_in)),
+ light_intensity() {}
+
+EffectsConfig::EffectsConfig(
+ CameraEffect effect_in,
+ BlurLevel blur_level_in,
+ GpuApi segmentation_gpu_api_in,
+ uint16_t graph_max_frames_in_flight_in,
+ bool blur_enabled_in,
+ bool replace_enabled_in,
+ bool relight_enabled_in,
+ SegmentationModel segmentation_model_in,
+ ::mojo_base::mojom::RelativeFilePathPtr background_filepath_in,
+ absl::optional<float> light_intensity_in)
+ : effect(std::move(effect_in)),
+ blur_level(std::move(blur_level_in)),
+ segmentation_gpu_api(std::move(segmentation_gpu_api_in)),
+ graph_max_frames_in_flight(std::move(graph_max_frames_in_flight_in)),
+ blur_enabled(std::move(blur_enabled_in)),
+ replace_enabled(std::move(replace_enabled_in)),
+ relight_enabled(std::move(relight_enabled_in)),
+ segmentation_model(std::move(segmentation_model_in)),
+ background_filepath(std::move(background_filepath_in)),
+ light_intensity(std::move(light_intensity_in)) {}
EffectsConfig::~EffectsConfig() = default;
@@ -214,6 +241,15 @@
"<value>"
#endif // BUILDFLAG(MOJO_TRACE_ENABLED)
);
+ perfetto_libchrome::WriteIntoTracedValueWithFallback(
+ dict.AddItem(
+ "light_intensity"), this->light_intensity,
+#if BUILDFLAG(MOJO_TRACE_ENABLED)
+ "<value of type absl::optional<float>>"
+#else
+ "<value>"
+#endif // BUILDFLAG(MOJO_TRACE_ENABLED)
+ );
}
bool EffectsConfig::Validate(
@@ -255,6 +291,9 @@
success = false;
if (success && !input.ReadBackgroundFilepath(&result->background_filepath))
success = false;
+ if (success) {
+ result->light_intensity = input.light_intensity();
+ }
*output = std::move(result);
return success;
}
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h
index bee4305..d01e889 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/cros-camera-libs/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h
@@ -108,6 +108,18 @@
SegmentationModel segmentation_model,
::mojo_base::mojom::RelativeFilePathPtr background_filepath);
+ EffectsConfig(
+ CameraEffect effect,
+ BlurLevel blur_level,
+ GpuApi segmentation_gpu_api,
+ uint16_t graph_max_frames_in_flight,
+ bool blur_enabled,
+ bool replace_enabled,
+ bool relight_enabled,
+ SegmentationModel segmentation_model,
+ ::mojo_base::mojom::RelativeFilePathPtr background_filepath,
+ absl::optional<float> light_intensity);
+
EffectsConfig(const EffectsConfig&) = delete;
EffectsConfig& operator=(const EffectsConfig&) = delete;
@@ -200,6 +212,8 @@
SegmentationModel segmentation_model;
::mojo_base::mojom::RelativeFilePathPtr background_filepath;
+
+ absl::optional<float> light_intensity;
// Serialise this struct into a trace.
void WriteIntoTrace(perfetto_libchrome::TracedValue traced_context) const;
@@ -241,7 +255,8 @@
mojo::Clone(replace_enabled),
mojo::Clone(relight_enabled),
mojo::Clone(segmentation_model),
- mojo::Clone(background_filepath)
+ mojo::Clone(background_filepath),
+ mojo::Clone(light_intensity)
);
}
@@ -265,6 +280,8 @@
return false;
if (!mojo::Equals(this->background_filepath, other_struct.background_filepath))
return false;
+ if (!mojo::Equals(this->light_intensity, other_struct.light_intensity))
+ return false;
return true;
}
@@ -306,6 +323,10 @@
return true;
if (rhs.background_filepath < lhs.background_filepath)
return false;
+ if (lhs.light_intensity < rhs.light_intensity)
+ return true;
+ if (rhs.light_intensity < lhs.light_intensity)
+ return false;
return false;
}
@@ -367,6 +388,11 @@
return input->background_filepath;
}
+ static decltype(::cros::mojom::EffectsConfig::light_intensity) light_intensity(
+ const ::cros::mojom::EffectsConfigPtr& input) {
+ return input->light_intensity;
+ }
+
static bool Read(::cros::mojom::EffectsConfig::DataView input, ::cros::mojom::EffectsConfigPtr* output);
};
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/metrics/out/Default/gen/include/metrics/structured/structured_events.cc b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/metrics/out/Default/gen/include/metrics/structured/structured_events.cc
index 1a49b64..cd0120b 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/metrics/out/Default/gen/include/metrics/structured/structured_events.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/metrics/out/Default/gen/include/metrics/structured/structured_events.cc
@@ -1279,6 +1279,85 @@
} // namespace usb_device
+namespace usb_session {
+
+UsbSessionEvent::UsbSessionEvent() :
+ ::metrics::structured::EventBase(kEventNameHash, kProjectNameHash, kIdType, kEventType) {}
+UsbSessionEvent::~UsbSessionEvent() = default;
+UsbSessionEvent& UsbSessionEvent::SetBootId(const std::string& value) {
+ AddHmacMetric(kBootIdNameHash, value);
+ return *this;
+}
+
+std::string UsbSessionEvent::GetBootIdForTest() const {
+ return GetHmacMetricForTest(kBootIdNameHash);
+}
+
+UsbSessionEvent& UsbSessionEvent::SetSystemTime(const int64_t value) {
+ AddIntMetric(kSystemTimeNameHash, value);
+ return *this;
+}
+
+int64_t UsbSessionEvent::GetSystemTimeForTest() const {
+ return GetIntMetricForTest(kSystemTimeNameHash);
+}
+
+UsbSessionEvent& UsbSessionEvent::SetAction(const int64_t value) {
+ AddIntMetric(kActionNameHash, value);
+ return *this;
+}
+
+int64_t UsbSessionEvent::GetActionForTest() const {
+ return GetIntMetricForTest(kActionNameHash);
+}
+
+UsbSessionEvent& UsbSessionEvent::SetDeviceNum(const int64_t value) {
+ AddIntMetric(kDeviceNumNameHash, value);
+ return *this;
+}
+
+int64_t UsbSessionEvent::GetDeviceNumForTest() const {
+ return GetIntMetricForTest(kDeviceNumNameHash);
+}
+
+UsbSessionEvent& UsbSessionEvent::SetBusNum(const int64_t value) {
+ AddIntMetric(kBusNumNameHash, value);
+ return *this;
+}
+
+int64_t UsbSessionEvent::GetBusNumForTest() const {
+ return GetIntMetricForTest(kBusNumNameHash);
+}
+
+UsbSessionEvent& UsbSessionEvent::SetDepth(const int64_t value) {
+ AddIntMetric(kDepthNameHash, value);
+ return *this;
+}
+
+int64_t UsbSessionEvent::GetDepthForTest() const {
+ return GetIntMetricForTest(kDepthNameHash);
+}
+
+UsbSessionEvent& UsbSessionEvent::SetVendorId(const int64_t value) {
+ AddIntMetric(kVendorIdNameHash, value);
+ return *this;
+}
+
+int64_t UsbSessionEvent::GetVendorIdForTest() const {
+ return GetIntMetricForTest(kVendorIdNameHash);
+}
+
+UsbSessionEvent& UsbSessionEvent::SetProductId(const int64_t value) {
+ AddIntMetric(kProductIdNameHash, value);
+ return *this;
+}
+
+int64_t UsbSessionEvent::GetProductIdForTest() const {
+ return GetIntMetricForTest(kProductIdNameHash);
+}
+
+} // namespace usb_session
+
namespace usb_error {
HubError::HubError() :
diff --git a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/metrics/out/Default/gen/include/metrics/structured/structured_events.h b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/metrics/out/Default/gen/include/metrics/structured/structured_events.h
index 600b439..72007ea 100644
--- a/chroot/build/amd64-generic/var/cache/portage/chromeos-base/metrics/out/Default/gen/include/metrics/structured/structured_events.h
+++ b/chroot/build/amd64-generic/var/cache/portage/chromeos-base/metrics/out/Default/gen/include/metrics/structured/structured_events.h
@@ -15,7 +15,7 @@
namespace structured {
namespace events {
-constexpr uint64_t kProjectNameHashes[] = {UINT64_C(9074739597929991885), UINT64_C(11181229631788078243), UINT64_C(1745381000935843040), UINT64_C(8206859287963243715), UINT64_C(11294265225635075664), UINT64_C(16881314472396226433), UINT64_C(10860358748803291132), UINT64_C(5876808001962504629), UINT64_C(17922303533051575891), UINT64_C(1370722622176744014), UINT64_C(4320592646346933548), UINT64_C(7302676440391025918), UINT64_C(4690103929823698613), UINT64_C(9675127341789951965)};
+constexpr uint64_t kProjectNameHashes[] = {UINT64_C(9074739597929991885), UINT64_C(11181229631788078243), UINT64_C(1745381000935843040), UINT64_C(8206859287963243715), UINT64_C(11294265225635075664), UINT64_C(16881314472396226433), UINT64_C(10860358748803291132), UINT64_C(5876808001962504629), UINT64_C(17922303533051575891), UINT64_C(1370722622176744014), UINT64_C(6962789877417678651), UINT64_C(4320592646346933548), UINT64_C(7302676440391025918), UINT64_C(4690103929823698613), UINT64_C(9675127341789951965)};
namespace bluetooth {
@@ -855,6 +855,55 @@
} // namespace usb_device
+namespace usb_session {
+
+class BRILLO_EXPORT UsbSessionEvent final : public ::metrics::structured::EventBase {
+ public:
+ UsbSessionEvent();
+ ~UsbSessionEvent() override;
+
+ static constexpr uint64_t kEventNameHash = UINT64_C(16939735174067274714);
+ static constexpr uint64_t kProjectNameHash = UINT64_C(6962789877417678651);
+ static constexpr IdType kIdType = IdType::kProjectId;
+ static constexpr StructuredEventProto_EventType kEventType =
+ StructuredEventProto_EventType_REGULAR;
+
+ static constexpr uint64_t kBootIdNameHash = UINT64_C(9983133050293312198);
+ UsbSessionEvent& SetBootId(const std::string& value);
+ std::string GetBootIdForTest() const;
+
+ static constexpr uint64_t kSystemTimeNameHash = UINT64_C(5430963162341175395);
+ UsbSessionEvent& SetSystemTime(const int64_t value);
+ int64_t GetSystemTimeForTest() const;
+
+ static constexpr uint64_t kActionNameHash = UINT64_C(21381969153622804);
+ UsbSessionEvent& SetAction(const int64_t value);
+ int64_t GetActionForTest() const;
+
+ static constexpr uint64_t kDeviceNumNameHash = UINT64_C(4313316212571108991);
+ UsbSessionEvent& SetDeviceNum(const int64_t value);
+ int64_t GetDeviceNumForTest() const;
+
+ static constexpr uint64_t kBusNumNameHash = UINT64_C(17302990436816966546);
+ UsbSessionEvent& SetBusNum(const int64_t value);
+ int64_t GetBusNumForTest() const;
+
+ static constexpr uint64_t kDepthNameHash = UINT64_C(7444545485412611639);
+ UsbSessionEvent& SetDepth(const int64_t value);
+ int64_t GetDepthForTest() const;
+
+ static constexpr uint64_t kVendorIdNameHash = UINT64_C(7982341394845147735);
+ UsbSessionEvent& SetVendorId(const int64_t value);
+ int64_t GetVendorIdForTest() const;
+
+ static constexpr uint64_t kProductIdNameHash = UINT64_C(3765840483194334735);
+ UsbSessionEvent& SetProductId(const int64_t value);
+ int64_t GetProductIdForTest() const;
+
+};
+
+} // namespace usb_session
+
namespace usb_error {
class BRILLO_EXPORT HubError final : public ::metrics::structured::EventBase {
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
index d6de77a..4000119 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
@@ -145,9 +145,10 @@
uint8_t blur_enabled : 1;
uint8_t replace_enabled : 1;
uint8_t relight_enabled : 1;
- uint8_t pad6_[1];
+ uint8_t light_intensity_$flag : 1;
+ uint8_t pad7_[1];
int32_t segmentation_model;
- uint8_t pad7_[4];
+ float light_intensity_$value;
mojo::internal::Pointer<::mojo_base::mojom::internal::RelativeFilePath_Data> background_filepath;
private:
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc
index a6e82a4..725653d 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc
@@ -149,6 +149,7 @@
{ 1, 24 },
{ 2, 32 },
{ 3, 40 },
+ { 4, 40 },
};
if (!ValidateStructHeaderAndVersionSizeAndClaimMemory(
data, kVersionSizes, validation_context)) {
@@ -191,7 +192,7 @@
}
EffectsConfig_Data::EffectsConfig_Data()
- : header_({sizeof(*this), 3}) {}
+ : header_({sizeof(*this), 4}) {}
} // namespace internal
} // namespace mojom
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h
index 76668cd..b3ad816 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h
@@ -261,6 +261,15 @@
return mojo::internal::Deserialize<::mojo_base::mojom::RelativeFilePathDataView>(
pointer, output, message_);
}
+ absl::optional<float> light_intensity() const {
+ if (data_->header_.version < 4) {
+ return absl::nullopt;
+ }
+
+ return data_->light_intensity_$flag
+ ? absl::make_optional(data_->light_intensity_$value)
+ : absl::nullopt;
+ }
private:
internal::EffectsConfig_Data* data_ = nullptr;
mojo::Message* message_ = nullptr;
@@ -406,6 +415,10 @@
in_background_filepath, background_filepath_fragment);
fragment->background_filepath.Set(
background_filepath_fragment.is_null() ? nullptr : background_filepath_fragment.data());
+ fragment->light_intensity_$flag = Traits::light_intensity(input).has_value();
+ if (Traits::light_intensity(input).has_value()) {
+ fragment->light_intensity_$value = Traits::light_intensity(input).value();
+ }
}
static bool Deserialize(::cros::mojom::internal::EffectsConfig_Data* input,
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc
index b2390ec..afaa1b5 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc
@@ -54,7 +54,8 @@
replace_enabled(),
relight_enabled(),
segmentation_model(),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -69,7 +70,8 @@
replace_enabled(),
relight_enabled(),
segmentation_model(),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -87,7 +89,8 @@
replace_enabled(std::move(replace_enabled_in)),
relight_enabled(std::move(relight_enabled_in)),
segmentation_model(),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -106,7 +109,8 @@
replace_enabled(std::move(replace_enabled_in)),
relight_enabled(std::move(relight_enabled_in)),
segmentation_model(std::move(segmentation_model_in)),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -126,7 +130,30 @@
replace_enabled(std::move(replace_enabled_in)),
relight_enabled(std::move(relight_enabled_in)),
segmentation_model(std::move(segmentation_model_in)),
- background_filepath(std::move(background_filepath_in)) {}
+ background_filepath(std::move(background_filepath_in)),
+ light_intensity() {}
+
+EffectsConfig::EffectsConfig(
+ CameraEffect effect_in,
+ BlurLevel blur_level_in,
+ GpuApi segmentation_gpu_api_in,
+ uint16_t graph_max_frames_in_flight_in,
+ bool blur_enabled_in,
+ bool replace_enabled_in,
+ bool relight_enabled_in,
+ SegmentationModel segmentation_model_in,
+ ::mojo_base::mojom::RelativeFilePathPtr background_filepath_in,
+ absl::optional<float> light_intensity_in)
+ : effect(std::move(effect_in)),
+ blur_level(std::move(blur_level_in)),
+ segmentation_gpu_api(std::move(segmentation_gpu_api_in)),
+ graph_max_frames_in_flight(std::move(graph_max_frames_in_flight_in)),
+ blur_enabled(std::move(blur_enabled_in)),
+ replace_enabled(std::move(replace_enabled_in)),
+ relight_enabled(std::move(relight_enabled_in)),
+ segmentation_model(std::move(segmentation_model_in)),
+ background_filepath(std::move(background_filepath_in)),
+ light_intensity(std::move(light_intensity_in)) {}
EffectsConfig::~EffectsConfig() = default;
@@ -214,6 +241,15 @@
"<value>"
#endif // BUILDFLAG(MOJO_TRACE_ENABLED)
);
+ perfetto_libchrome::WriteIntoTracedValueWithFallback(
+ dict.AddItem(
+ "light_intensity"), this->light_intensity,
+#if BUILDFLAG(MOJO_TRACE_ENABLED)
+ "<value of type absl::optional<float>>"
+#else
+ "<value>"
+#endif // BUILDFLAG(MOJO_TRACE_ENABLED)
+ );
}
bool EffectsConfig::Validate(
@@ -255,6 +291,9 @@
success = false;
if (success && !input.ReadBackgroundFilepath(&result->background_filepath))
success = false;
+ if (success) {
+ result->light_intensity = input.light_intensity();
+ }
*output = std::move(result);
return success;
}
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h
index bee4305..d01e889 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-frame-annotator/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h
@@ -108,6 +108,18 @@
SegmentationModel segmentation_model,
::mojo_base::mojom::RelativeFilePathPtr background_filepath);
+ EffectsConfig(
+ CameraEffect effect,
+ BlurLevel blur_level,
+ GpuApi segmentation_gpu_api,
+ uint16_t graph_max_frames_in_flight,
+ bool blur_enabled,
+ bool replace_enabled,
+ bool relight_enabled,
+ SegmentationModel segmentation_model,
+ ::mojo_base::mojom::RelativeFilePathPtr background_filepath,
+ absl::optional<float> light_intensity);
+
EffectsConfig(const EffectsConfig&) = delete;
EffectsConfig& operator=(const EffectsConfig&) = delete;
@@ -200,6 +212,8 @@
SegmentationModel segmentation_model;
::mojo_base::mojom::RelativeFilePathPtr background_filepath;
+
+ absl::optional<float> light_intensity;
// Serialise this struct into a trace.
void WriteIntoTrace(perfetto_libchrome::TracedValue traced_context) const;
@@ -241,7 +255,8 @@
mojo::Clone(replace_enabled),
mojo::Clone(relight_enabled),
mojo::Clone(segmentation_model),
- mojo::Clone(background_filepath)
+ mojo::Clone(background_filepath),
+ mojo::Clone(light_intensity)
);
}
@@ -265,6 +280,8 @@
return false;
if (!mojo::Equals(this->background_filepath, other_struct.background_filepath))
return false;
+ if (!mojo::Equals(this->light_intensity, other_struct.light_intensity))
+ return false;
return true;
}
@@ -306,6 +323,10 @@
return true;
if (rhs.background_filepath < lhs.background_filepath)
return false;
+ if (lhs.light_intensity < rhs.light_intensity)
+ return true;
+ if (rhs.light_intensity < lhs.light_intensity)
+ return false;
return false;
}
@@ -367,6 +388,11 @@
return input->background_filepath;
}
+ static decltype(::cros::mojom::EffectsConfig::light_intensity) light_intensity(
+ const ::cros::mojom::EffectsConfigPtr& input) {
+ return input->light_intensity;
+ }
+
static bool Read(::cros::mojom::EffectsConfig::DataView input, ::cros::mojom::EffectsConfigPtr* output);
};
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
index d6de77a..4000119 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared-internal.h
@@ -145,9 +145,10 @@
uint8_t blur_enabled : 1;
uint8_t replace_enabled : 1;
uint8_t relight_enabled : 1;
- uint8_t pad6_[1];
+ uint8_t light_intensity_$flag : 1;
+ uint8_t pad7_[1];
int32_t segmentation_model;
- uint8_t pad7_[4];
+ float light_intensity_$value;
mojo::internal::Pointer<::mojo_base::mojom::internal::RelativeFilePath_Data> background_filepath;
private:
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc
index a6e82a4..725653d 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.cc
@@ -149,6 +149,7 @@
{ 1, 24 },
{ 2, 32 },
{ 3, 40 },
+ { 4, 40 },
};
if (!ValidateStructHeaderAndVersionSizeAndClaimMemory(
data, kVersionSizes, validation_context)) {
@@ -191,7 +192,7 @@
}
EffectsConfig_Data::EffectsConfig_Data()
- : header_({sizeof(*this), 3}) {}
+ : header_({sizeof(*this), 4}) {}
} // namespace internal
} // namespace mojom
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h
index 76668cd..b3ad816 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom-shared.h
@@ -261,6 +261,15 @@
return mojo::internal::Deserialize<::mojo_base::mojom::RelativeFilePathDataView>(
pointer, output, message_);
}
+ absl::optional<float> light_intensity() const {
+ if (data_->header_.version < 4) {
+ return absl::nullopt;
+ }
+
+ return data_->light_intensity_$flag
+ ? absl::make_optional(data_->light_intensity_$value)
+ : absl::nullopt;
+ }
private:
internal::EffectsConfig_Data* data_ = nullptr;
mojo::Message* message_ = nullptr;
@@ -406,6 +415,10 @@
in_background_filepath, background_filepath_fragment);
fragment->background_filepath.Set(
background_filepath_fragment.is_null() ? nullptr : background_filepath_fragment.data());
+ fragment->light_intensity_$flag = Traits::light_intensity(input).has_value();
+ if (Traits::light_intensity(input).has_value()) {
+ fragment->light_intensity_$value = Traits::light_intensity(input).value();
+ }
}
static bool Deserialize(::cros::mojom::internal::EffectsConfig_Data* input,
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc
index b2390ec..afaa1b5 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.cc
@@ -54,7 +54,8 @@
replace_enabled(),
relight_enabled(),
segmentation_model(),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -69,7 +70,8 @@
replace_enabled(),
relight_enabled(),
segmentation_model(),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -87,7 +89,8 @@
replace_enabled(std::move(replace_enabled_in)),
relight_enabled(std::move(relight_enabled_in)),
segmentation_model(),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -106,7 +109,8 @@
replace_enabled(std::move(replace_enabled_in)),
relight_enabled(std::move(relight_enabled_in)),
segmentation_model(std::move(segmentation_model_in)),
- background_filepath() {}
+ background_filepath(),
+ light_intensity() {}
EffectsConfig::EffectsConfig(
CameraEffect effect_in,
@@ -126,7 +130,30 @@
replace_enabled(std::move(replace_enabled_in)),
relight_enabled(std::move(relight_enabled_in)),
segmentation_model(std::move(segmentation_model_in)),
- background_filepath(std::move(background_filepath_in)) {}
+ background_filepath(std::move(background_filepath_in)),
+ light_intensity() {}
+
+EffectsConfig::EffectsConfig(
+ CameraEffect effect_in,
+ BlurLevel blur_level_in,
+ GpuApi segmentation_gpu_api_in,
+ uint16_t graph_max_frames_in_flight_in,
+ bool blur_enabled_in,
+ bool replace_enabled_in,
+ bool relight_enabled_in,
+ SegmentationModel segmentation_model_in,
+ ::mojo_base::mojom::RelativeFilePathPtr background_filepath_in,
+ absl::optional<float> light_intensity_in)
+ : effect(std::move(effect_in)),
+ blur_level(std::move(blur_level_in)),
+ segmentation_gpu_api(std::move(segmentation_gpu_api_in)),
+ graph_max_frames_in_flight(std::move(graph_max_frames_in_flight_in)),
+ blur_enabled(std::move(blur_enabled_in)),
+ replace_enabled(std::move(replace_enabled_in)),
+ relight_enabled(std::move(relight_enabled_in)),
+ segmentation_model(std::move(segmentation_model_in)),
+ background_filepath(std::move(background_filepath_in)),
+ light_intensity(std::move(light_intensity_in)) {}
EffectsConfig::~EffectsConfig() = default;
@@ -214,6 +241,15 @@
"<value>"
#endif // BUILDFLAG(MOJO_TRACE_ENABLED)
);
+ perfetto_libchrome::WriteIntoTracedValueWithFallback(
+ dict.AddItem(
+ "light_intensity"), this->light_intensity,
+#if BUILDFLAG(MOJO_TRACE_ENABLED)
+ "<value of type absl::optional<float>>"
+#else
+ "<value>"
+#endif // BUILDFLAG(MOJO_TRACE_ENABLED)
+ );
}
bool EffectsConfig::Validate(
@@ -255,6 +291,9 @@
success = false;
if (success && !input.ReadBackgroundFilepath(&result->background_filepath))
success = false;
+ if (success) {
+ result->light_intensity = input.light_intensity();
+ }
*output = std::move(result);
return success;
}
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h
index bee4305..d01e889 100644
--- a/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h
+++ b/chroot/build/amd64-generic/var/cache/portage/media-libs/cros-camera-sw-privacy-switch-test/out/Default/gen/include/camera/mojo/effects/effects_pipeline.mojom.h
@@ -108,6 +108,18 @@
SegmentationModel segmentation_model,
::mojo_base::mojom::RelativeFilePathPtr background_filepath);
+ EffectsConfig(
+ CameraEffect effect,
+ BlurLevel blur_level,
+ GpuApi segmentation_gpu_api,
+ uint16_t graph_max_frames_in_flight,
+ bool blur_enabled,
+ bool replace_enabled,
+ bool relight_enabled,
+ SegmentationModel segmentation_model,
+ ::mojo_base::mojom::RelativeFilePathPtr background_filepath,
+ absl::optional<float> light_intensity);
+
EffectsConfig(const EffectsConfig&) = delete;
EffectsConfig& operator=(const EffectsConfig&) = delete;
@@ -200,6 +212,8 @@
SegmentationModel segmentation_model;
::mojo_base::mojom::RelativeFilePathPtr background_filepath;
+
+ absl::optional<float> light_intensity;
// Serialise this struct into a trace.
void WriteIntoTrace(perfetto_libchrome::TracedValue traced_context) const;
@@ -241,7 +255,8 @@
mojo::Clone(replace_enabled),
mojo::Clone(relight_enabled),
mojo::Clone(segmentation_model),
- mojo::Clone(background_filepath)
+ mojo::Clone(background_filepath),
+ mojo::Clone(light_intensity)
);
}
@@ -265,6 +280,8 @@
return false;
if (!mojo::Equals(this->background_filepath, other_struct.background_filepath))
return false;
+ if (!mojo::Equals(this->light_intensity, other_struct.light_intensity))
+ return false;
return true;
}
@@ -306,6 +323,10 @@
return true;
if (rhs.background_filepath < lhs.background_filepath)
return false;
+ if (lhs.light_intensity < rhs.light_intensity)
+ return true;
+ if (rhs.light_intensity < lhs.light_intensity)
+ return false;
return false;
}
@@ -367,6 +388,11 @@
return input->background_filepath;
}
+ static decltype(::cros::mojom::EffectsConfig::light_intensity) light_intensity(
+ const ::cros::mojom::EffectsConfigPtr& input) {
+ return input->light_intensity;
+ }
+
static bool Read(::cros::mojom::EffectsConfig::DataView input, ::cros::mojom::EffectsConfigPtr* output);
};
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/bindings/python/google_benchmark/benchmark.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/bindings/python/google_benchmark/benchmark.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/bindings/python/google_benchmark/benchmark.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/bindings/python/google_benchmark/benchmark.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/include/benchmark/benchmark.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/include/benchmark/benchmark.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/include/benchmark/benchmark.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/include/benchmark/benchmark.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/include/benchmark/export.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/include/benchmark/export.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/include/benchmark/export.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/include/benchmark/export.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/benchmark.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/benchmark.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/benchmark.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/benchmark.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/check.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/check.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/check.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/check.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/check.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/check.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/check.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/check.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/log.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/log.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/log.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/log.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/mutex.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/mutex.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/mutex.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/mutex.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/reporter.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/reporter.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/reporter.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/reporter.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/string_util.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/string_util.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/string_util.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/string_util.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/string_util.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/string_util.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/src/string_util.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/src/string_util.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/test/benchmark_test.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/test/benchmark_test.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/com_github_google_benchmark/test/benchmark_test.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/com_github_google_benchmark/test/benchmark_test.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/ijar/common.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/ijar/common.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/ijar/common.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/ijar/common.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/errors.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/errors.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/errors.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/errors.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/file.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/file.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/file.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/file.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/file.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/file.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/file.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/file.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/file_posix.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/file_posix.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/file_posix.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/file_posix.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/logging.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/logging.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/logging.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/logging.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/logging.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/logging.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/logging.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/logging.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/md5.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/md5.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/md5.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/md5.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/numbers.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/path.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/path.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/path.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/path.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/port.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/port.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/port.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/port.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/port.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/port.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/port.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/port.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/strings.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/strings.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/cpp/util/strings.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/cpp/util/strings.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/native/windows/file.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/native/windows/file.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/native/windows/file.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/native/windows/file.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/native/windows/file.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/native/windows/file.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/native/windows/file.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/native/windows/file.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/native/windows/util.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/native/windows/util.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/native/windows/util.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/native/windows/util.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/native/windows/util.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/native/windows/util.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/main/native/windows/util.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/main/native/windows/util.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/tools/singlejar/diag.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/tools/singlejar/diag.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/tools/singlejar/diag.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/tools/singlejar/diag.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/tools/singlejar/options.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/tools/singlejar/options.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/tools/singlejar/options.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/tools/singlejar/options.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/tools/singlejar/port.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/tools/singlejar/port.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/src/tools/singlejar/port.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/src/tools/singlejar/port.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/zlib/crc32.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/zlib/crc32.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/zlib/crc32.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/zlib/crc32.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/zlib/zconf.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/zlib/zconf.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/zlib/zconf.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/zlib/zconf.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/zlib/zlib.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/zlib/zlib.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/f424a5288e65794d89af5394a9f5c81a/external/remote_java_tools/java_tools/zlib/zlib.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/c297c128e88e2e6820da3d8f22b73d44/external/remote_java_tools/java_tools/zlib/zlib.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/errors.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/errors.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/errors.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/errors.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/file.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/file.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/file.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/file.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/file.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/file.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/file.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/file.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/file_posix.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/file_posix.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/file_posix.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/file_posix.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/logging.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/logging.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/logging.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/logging.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/logging.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/logging.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/logging.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/logging.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/md5.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/md5.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/md5.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/md5.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/numbers.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/numbers.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/numbers.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/numbers.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/numbers.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/numbers.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/numbers.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/numbers.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/path.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/path.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/path.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/path.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/port.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/port.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/port.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/port.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/port.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/port.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/port.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/port.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/strings.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/strings.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/cpp/util/strings.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/cpp/util/strings.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/native/windows/file.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/native/windows/file.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/native/windows/file.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/native/windows/file.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/native/windows/file.h b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/native/windows/file.h
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/native/windows/file.h
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/native/windows/file.h
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/native/windows/process.cc b/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/native/windows/process.cc
similarity index 100%
rename from chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/native/windows/process.cc
rename to chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/2c2b78fc84955874f263e86440f2835a/embedded_tools/src/main/native/windows/process.cc
diff --git a/chroot/build/amd64-generic/var/cache/portage/media-sound/adhd/install/82de49c2ae07d5fe829d7bbefcd93818/embedded_tools/src/main/native/windows/process.h
