diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-09-30 16:29:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-30 16:29:50 +0000 |
| commit | 90e0d9c5864032ddb9806476fc58f9ef0014995b (patch) | |
| tree | b136406821d0c5e4ebbd8091055593eee592deef /media/libstagefright/wifi-display | |
| parent | deecfc0b1b5e8114a7fb02a9daa5e36e2cd7b94b (diff) | |
| parent | 912285971c9bdb358b1fc06a7ea320fc8f001d5c (diff) | |
| download | frameworks_av-90e0d9c5864032ddb9806476fc58f9ef0014995b.zip frameworks_av-90e0d9c5864032ddb9806476fc58f9ef0014995b.tar.gz frameworks_av-90e0d9c5864032ddb9806476fc58f9ef0014995b.tar.bz2 | |
am 91228597: am 95fd067c: Merge "Fix linkage when building with clang, Intel CC or gcc -O0"
* commit '912285971c9bdb358b1fc06a7ea320fc8f001d5c':
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( |