summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-17 23:33:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-17 23:33:50 +0000
commit0b8710ff8e9703fc964f5f1e0586905296e2f624 (patch)
treece5d8d686afd0b380b20e0f53205652f045c444a /include
parentb16d1be55718363feb5d69affea0aa646b6b6b2c (diff)
parent4f7e54f32d256e285c400a0f8cfa56bff9d5a8fa (diff)
downloadsystem_core-0b8710ff8e9703fc964f5f1e0586905296e2f624.zip
system_core-0b8710ff8e9703fc964f5f1e0586905296e2f624.tar.gz
system_core-0b8710ff8e9703fc964f5f1e0586905296e2f624.tar.bz2
am 4f7e54f3: am fe545b9c: am 0516aded: Merge "logd: libsysutils: logd startup outside init environment"
* commit '4f7e54f32d256e285c400a0f8cfa56bff9d5a8fa': logd: libsysutils: logd startup outside init environment
Diffstat (limited to 'include')
-rw-r--r--include/sysutils/FrameworkListener.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sysutils/FrameworkListener.h b/include/sysutils/FrameworkListener.h
index f1a4b43..18049cd 100644
--- a/include/sysutils/FrameworkListener.h
+++ b/include/sysutils/FrameworkListener.h
@@ -36,6 +36,7 @@ private:
public:
FrameworkListener(const char *socketName);
FrameworkListener(const char *socketName, bool withSeq);
+ FrameworkListener(int sock);
virtual ~FrameworkListener() {}
protected: