Merge "fix the permission check crash in statsd."

diff --cc cmds/statsd/src/StatsService.cpp
Simple merge

diff --cc cmds/statsd/src/config/ConfigManager.cpp
index bc3a7b2,2e6edfe..3319f6d
--- 1/cmds/statsd/src/config/ConfigManager.cpp
--- 2/cmds/statsd/src/config/ConfigManager.cpp
+++ b/cmds/statsd/src/config/ConfigManager.cpp
@@@ -42,10 -35,11 +42,10 @@@ ConfigManager::~ConfigManager() 
  }
  
  void ConfigManager::Startup() {
 -    // TODO: Implement me -- read from storage and call onto all of the listeners.
 -    // Instead, we'll just make a fake one.
 +    readConfigFromDisk();
  
      // this should be called from StatsService when it receives a statsd_config
-     UpdateConfig(ConfigKey(0, "fake"), build_fake_config());
+     UpdateConfig(ConfigKey(1000, "fake"), build_fake_config());
  }
  
  void ConfigManager::AddListener(const sp<ConfigListener>& listener) {