tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 5d1a943d: am 002f9d5c: Merge "adb: fix adbd feature parsing for no features."

Browse source 
* commit '5d1a943dc49dcb1513d64e281efb522d704dea02':
  adb: fix adbd feature parsing for no features.
This commit is contained in:
David Pursell 2015-09-28 16:14:30 +00:00 committed by Android Git Automerger
commit 0f427fead7
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/adb.cpp
View file

@ -239,6 +239,10 @@ void parse_banner(const std::string& banner, atransport* t) {
// "device::ro.product.name=x;ro.product.model=y;ro.product.device=z;".
std::vector<std::string> pieces = android::base::Split(banner, ":");
// Reset the features list or else if the server sends no features we may
// keep the existing feature set (http://b/24405971).
t->SetFeatures("");
if (pieces.size() > 2) {
const std::string& props = pieces[2];
for (auto& prop : android::base::Split(props, ";")) {

4
adb/transport.cpp
View file

@ -796,6 +796,10 @@ std::string FeatureSetToString(const FeatureSet& features) {
}
FeatureSet StringToFeatureSet(const std::string& features_string) {
if (features_string.empty()) {
return FeatureSet();
}
auto names = android::base::Split(features_string,
{kFeatureStringDelimiter});
return FeatureSet(names.begin(), names.end());

3
adb/transport_test.cpp
View file

@ -167,6 +167,9 @@ TEST(transport, SetFeatures) {
ASSERT_FALSE(t.has_feature("foo"));
ASSERT_TRUE(t.has_feature("bar"));
ASSERT_TRUE(t.has_feature("baz"));
t.SetFeatures("");
ASSERT_EQ(0U, t.features().size());
}
TEST(transport, parse_banner_no_features) {