summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-04-05 12:31:20 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-04-05 12:31:20 -0700
commit1ea1107de83c91b54f633640854bcb363516a44b (patch)
tree7152e21a1d1b552caa514e7364cbfeffe042e60c /include
parentf42cede4106389bc99c86dea857afd04b4a79805 (diff)
parent86967280c797ec37605c5833d4255f74937bf3da (diff)
downloadframeworks_av-1ea1107de83c91b54f633640854bcb363516a44b.zip
frameworks_av-1ea1107de83c91b54f633640854bcb363516a44b.tar.gz
frameworks_av-1ea1107de83c91b54f633640854bcb363516a44b.tar.bz2
Merge tag 'android-6.0.1_r24' into HEAD
Ticket: CYNGNOS-2213 Android 6.0.1 release 24
Diffstat (limited to 'include')
-rw-r--r--include/media/mediametadataretriever.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h
index f655f35..8ed07ee 100644
--- a/include/media/mediametadataretriever.h
+++ b/include/media/mediametadataretriever.h
@@ -82,7 +82,7 @@ public:
const char* extractMetadata(int keyCode);
private:
- static const sp<IMediaPlayerService>& getService();
+ static const sp<IMediaPlayerService> getService();
class DeathNotifier: public IBinder::DeathRecipient
{