diff options
| author | Samuel Tan <samueltan@google.com> | 2016-01-08 17:25:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-08 17:25:36 +0000 |
| commit | b4f43d5abe65dfe85f95f9b6aec0429232f2fdfc (patch) | |
| tree | 1a848cf7f8b24e161136aaaa054dc0766395f5ef | |
| parent | 288dff1121bdea09b827ca28e8aa215489a8dbaa (diff) | |
| parent | c378b70219504746359d18f8aa9382f5b141e420 (diff) | |
| download | shill-b4f43d5abe65dfe85f95f9b6aec0429232f2fdfc.tar.gz | |
shill: add binder scope name to ScopeLogger
am: c378b70219
* commit 'c378b70219504746359d18f8aa9382f5b141e420':
shill: add binder scope name to ScopeLogger
| -rw-r--r-- | scope_logger.cc | 1 | ||||
| -rw-r--r-- | scope_logger.h | 3 | ||||
| -rw-r--r-- | scope_logger_unittest.cc | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/scope_logger.cc b/scope_logger.cc index 6f5c21df..55bcb311 100644 --- a/scope_logger.cc +++ b/scope_logger.cc @@ -33,6 +33,7 @@ const int kDefaultVerboseLevel = 0; // Scope names corresponding to the scope defined by ScopeLogger::Scope. const char* const kScopeNames[] = { + "binder", "cellular", "connection", "crypto", diff --git a/scope_logger.h b/scope_logger.h index ddf6367c..0fe31f09 100644 --- a/scope_logger.h +++ b/scope_logger.h @@ -38,7 +38,8 @@ class ScopeLogger { // Update kScopeNames in scope_logger.cc after changing this enumerated type. // These scope identifiers are sorted by their scope names alphabetically. enum Scope { - kCellular = 0, + kBinder = 0, + kCellular, kConnection, kCrypto, kDaemon, diff --git a/scope_logger_unittest.cc b/scope_logger_unittest.cc index 17cd3f2e..8b37febe 100644 --- a/scope_logger_unittest.cc +++ b/scope_logger_unittest.cc @@ -50,7 +50,8 @@ TEST_F(ScopeLoggerTest, DefaultConstruction) { } TEST_F(ScopeLoggerTest, GetAllScopeNames) { - EXPECT_EQ("cellular+" + EXPECT_EQ("binder+" + "cellular+" "connection+" "crypto+" "daemon+" |