diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-09-30 16:26:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-30 16:26:13 +0000 |
| commit | 912285971c9bdb358b1fc06a7ea320fc8f001d5c (patch) | |
| tree | 05917090ccb1664004c78a54ee441ec8a5981a7a /media/libstagefright/wifi-display | |
| parent | c53b98f3773299ca26acbe5c4a56450a76c2ecf9 (diff) | |
| parent | 95fd067cc8dc8cd10bd14dba5bc2000600c75449 (diff) | |
| download | frameworks_av-912285971c9bdb358b1fc06a7ea320fc8f001d5c.zip frameworks_av-912285971c9bdb358b1fc06a7ea320fc8f001d5c.tar.gz frameworks_av-912285971c9bdb358b1fc06a7ea320fc8f001d5c.tar.bz2 | |
am 95fd067c: Merge "Fix linkage when building with clang, Intel CC or gcc -O0"
* commit '95fd067cc8dc8cd10bd14dba5bc2000600c75449':
Fix linkage when building with clang, Intel CC or gcc -O0
Diffstat (limited to 'media/libstagefright/wifi-display')
| -rw-r--r-- | media/libstagefright/wifi-display/source/WifiDisplaySource.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index da405e2..0c39ccf 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -43,6 +43,10 @@ namespace android { // static +const int64_t WifiDisplaySource::kReaperIntervalUs; +const int64_t WifiDisplaySource::kTeardownTriggerTimeouSecs; +const int64_t WifiDisplaySource::kPlaybackSessionTimeoutSecs; +const int64_t WifiDisplaySource::kPlaybackSessionTimeoutUs; const AString WifiDisplaySource::sUserAgent = MakeUserAgent(); WifiDisplaySource::WifiDisplaySource( |