diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-06-02 01:48:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-02 01:48:23 +0000 |
| commit | cb18ec05b7097a63262b81afe1e866105d400f4a (patch) | |
| tree | 4b13077360dfb54722298be1b793a8df5ddc6d7a /include | |
| parent | cc7cc67349b7a3f498882087aa42ffc05a2daf11 (diff) | |
| parent | 99e69716215cd0665379bc90d708f2ea8689831d (diff) | |
| download | frameworks_av-cb18ec05b7097a63262b81afe1e866105d400f4a.zip frameworks_av-cb18ec05b7097a63262b81afe1e866105d400f4a.tar.gz frameworks_av-cb18ec05b7097a63262b81afe1e866105d400f4a.tar.bz2 | |
Merge "Track camera and flashlight usage in battery stats." into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 6e14fc5..d62b35d 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -60,8 +60,6 @@ struct MediaCodec : public AHandler { CB_RESOURCE_RECLAIMED = 5, }; - struct BatteryNotifier; - static sp<MediaCodec> CreateByType( const sp<ALooper> &looper, const char *mime, bool encoder, status_t *err = NULL); |