summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayer.h
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-11-16 00:34:56 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-11-16 00:34:56 -0800
commit19232747b795fc5496364b48e34a62d453e31694 (patch)
tree10d5e00be042f6ec7cb9a9fc71f5262a4d9a734f /media/libmediaplayerservice/nuplayer/NuPlayer.h
parent6c6f283bfee003b32843c0d4cec19604b6875927 (diff)
parent767254cd47bbcaa5ad9e09a6f0bae4a703fbdf7e (diff)
downloadframeworks_av-19232747b795fc5496364b48e34a62d453e31694.zip
frameworks_av-19232747b795fc5496364b48e34a62d453e31694.tar.gz
frameworks_av-19232747b795fc5496364b48e34a62d453e31694.tar.bz2
Merge "nuplayer: Perform proper shutdown sequence for offload teardown"
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h
index 32a3efe..b934e4e 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h
@@ -281,7 +281,7 @@ protected:
void writeTrackInfo(Parcel* reply, const sp<AMessage> format) const;
- void tearDownPCMOffload(const sp<AMessage> &msg);
+ void performTearDown(const sp<AMessage> &msg);
DISALLOW_EVIL_CONSTRUCTORS(NuPlayer);
};