summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-09-03 15:52:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-03 15:52:23 +0000
commitea8462ccd1a882f2c7c785250bcfaa2606b53cb5 (patch)
treee5125d090918b769896b73470f53ba52b80bdf9c /include
parent23c8cf958b1a756d5e0c78c46eac676676be4fdd (diff)
parent047dd13ca42ff7cea10821ef64eb09229fa3e751 (diff)
downloadframeworks_av-ea8462ccd1a882f2c7c785250bcfaa2606b53cb5.zip
frameworks_av-ea8462ccd1a882f2c7c785250bcfaa2606b53cb5.tar.gz
frameworks_av-ea8462ccd1a882f2c7c785250bcfaa2606b53cb5.tar.bz2
Merge "Fix more potential deadlocks in ALooperRoster" into lmp-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/foundation/ALooperRoster.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/media/stagefright/foundation/ALooperRoster.h b/include/media/stagefright/foundation/ALooperRoster.h
index 940fc55..4d76b64 100644
--- a/include/media/stagefright/foundation/ALooperRoster.h
+++ b/include/media/stagefright/foundation/ALooperRoster.h
@@ -56,8 +56,6 @@ private:
KeyedVector<uint32_t, sp<AMessage> > mReplies;
- status_t postMessage_l(const sp<AMessage> &msg, int64_t delayUs);
-
DISALLOW_EVIL_CONSTRUCTORS(ALooperRoster);
};