Revert "New NativeDaemonConnector protocol adds a seqnum."
Reverting because it seems to break `adb reboot`
This reverts commit dc58e73071aa829a5038caf37211f6b3e2d7b275.
Change-Id: Ib8cc4379254694398cbb7f3e7a64c20e1ed8c1ba
diff --git a/include/sysutils/FrameworkListener.h b/include/sysutils/FrameworkListener.h
index d8c4258..142f50c 100644
--- a/include/sysutils/FrameworkListener.h
+++ b/include/sysutils/FrameworkListener.h
@@ -24,11 +24,7 @@
class FrameworkListener : public SocketListener {
public:
static const int CMD_ARGS_MAX = 16;
-
- /* 1 out of errorRate will be dropped */
- int errorRate;
private:
- int mCommandCount;
FrameworkCommandCollection *mCommands;
public:
diff --git a/include/sysutils/SocketClient.h b/include/sysutils/SocketClient.h
index 96323ac..7d2b1d6 100644
--- a/include/sysutils/SocketClient.h
+++ b/include/sysutils/SocketClient.h
@@ -24,9 +24,6 @@
pthread_mutex_t mRefCountMutex;
int mRefCount;
- pthread_mutex_t mCmdNumMutex;
- int mCmdNum;
-
public:
SocketClient(int sock, bool owned);
virtual ~SocketClient();
@@ -35,13 +32,12 @@
pid_t getPid() const { return mPid; }
uid_t getUid() const { return mUid; }
gid_t getGid() const { return mGid; }
- void setCmdNum(int cmdNum);
- int getCmdNum();
// Send null-terminated C strings:
int sendMsg(int code, const char *msg, bool addErrno);
+ int sendMsg(const char *msg);
- //Sending binary data:
+ // Sending binary data:
int sendData(const void *data, int len);
// Optional reference counting. Reference count starts at 1. If
@@ -50,10 +46,6 @@
// decRef() when it's done with the client.
void incRef();
bool decRef(); // returns true at 0 (but note: SocketClient already deleted)
-
-private:
- // Send null-terminated C strings
- int sendMsg(const char *msg);
};
typedef android::List<SocketClient *> SocketClientCollection;
diff --git a/include/sysutils/SocketListener.h b/include/sysutils/SocketListener.h
index 64a52f4..6592b01 100644
--- a/include/sysutils/SocketListener.h
+++ b/include/sysutils/SocketListener.h
@@ -38,6 +38,7 @@
int stopListener();
void sendBroadcast(int code, const char *msg, bool addErrno);
+ void sendBroadcast(const char *msg);
protected:
virtual bool onDataAvailable(SocketClient *c) = 0;