summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerService.h
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-10-06 13:22:16 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-10-06 13:22:16 -0700
commitcb1cdffd7dfae7db36ecd06ce058eba505fb1b9d (patch)
tree77b3c4f0794948b7bbea40a65d0f7856cde7f770 /media/libmediaplayerservice/MediaPlayerService.h
parent3f6bb688b22b184b0bfc2739cda3c3cf0dd06a14 (diff)
parentf42ee8bd0cb51c571dd6dfcf71c61dce377768cd (diff)
downloadframeworks_av-cb1cdffd7dfae7db36ecd06ce058eba505fb1b9d.zip
frameworks_av-cb1cdffd7dfae7db36ecd06ce058eba505fb1b9d.tar.gz
frameworks_av-cb1cdffd7dfae7db36ecd06ce058eba505fb1b9d.tar.bz2
Merge tag 'android-6.0.1_r72' into HEAD
Android 6.0.1 Release 72 (M4B30X) Change-Id: I617426a3fbf7a8d013c5be838ad4c80a00b61a5f
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.h')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h
index ff8f550..2bd7ec5 100644
--- a/media/libmediaplayerservice/MediaPlayerService.h
+++ b/media/libmediaplayerservice/MediaPlayerService.h
@@ -227,6 +227,7 @@ public:
virtual status_t dump(int fd, const Vector<String16>& args);
void removeClient(wp<Client> client);
+ bool hasClient(wp<Client> client);
// For battery usage tracking purpose
struct BatteryUsageInfo {