Merge "ShellSubscriber: Avoid rollover bug" into rvc-dev am: f1d96d48f6 am: 2f552669c4 am: cc02f9b575

Change-Id: I974438d3b45cfb6d8b1d5b60a6dc5dd527704498

cmds/statsd/src/shell/ShellSubscriber.cpp

@@ -41,7 +41,7 @@ void ShellSubscriber::startNewSubscription(int in, int out, int timeoutSec) {
 
     // critical-section
     std::unique_lock<std::mutex> lock(mMutex);
-    if (myToken < mToken) {
+    if (myToken != mToken) {
         // Some other subscription has already come in. Stop.
         return;
     }

cmds/statsd/src/shell/ShellSubscriber.h

@@ -108,7 +108,7 @@ private:
 
     std::shared_ptr<SubscriptionInfo> mSubscriptionInfo = nullptr;
 
-    int mToken;
+    int mToken = 0;
 };
 
 }  // namespace statsd