Chong Zhang
719e24e823
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
am: 2b1df0008a
am: b38111a0db
am: fb7c6d9173
am: ee1f46846d
am: 8486817a65
am: 0ac0157213
am: a06a77509b
am: 24145427ed
am: 8a4f540bdf
...
am: f62d2cf89a
Change-Id: I502a1b8fe8a7344b2ecf34b4145b3b1de7f303a6
7 years ago
Chong Zhang
62a307a826
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
am: a29bd6a709
am: d7c144c545
am: 3fd727d787
am: 33e76e05a3
am: dfd2808073
am: db22689ffa
...
am: 6fa5e38154
Change-Id: I31bb503ed6c1dbb21866d576bc7988a3c5e30019
7 years ago
Chong Zhang
f62d2cf89a
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
am: 2b1df0008a
am: b38111a0db
am: fb7c6d9173
am: ee1f46846d
am: 8486817a65
am: 0ac0157213
am: a06a77509b
am: 24145427ed
...
am: 8a4f540bdf
Change-Id: I54c720b3fedd046d9b308c33882f80a4a38466a5
7 years ago
Chong Zhang
ad42ef74eb
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
am: a29bd6a709
am: d7c144c545
am: 3fd727d787
am: 33e76e05a3
am: dfd2808073
am: db22689ffa
am: 9ada6f85bf
...
am: 865b5dc8ad
Change-Id: I100a7f4db5df765ec151ee63dc0951a64fcb1d21
7 years ago
Phil Burk
67a69ea564
Merge "aaudio: fix intermittent hang and position error" into oc-dr1-dev am: c1fe2634dc
...
am: 2dd56c9e2c
Change-Id: I2324f99835d005d46cc2838888c3cc65e66730a1
7 years ago
Chong Zhang
8a4f540bdf
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
am: 2b1df0008a
am: b38111a0db
am: fb7c6d9173
am: ee1f46846d
am: 8486817a65
am: 0ac0157213
am: a06a77509b
...
am: 24145427ed
Change-Id: I55ab577a8a2cee7d819439a0c6e04d88248523b9
7 years ago
Chong Zhang
24145427ed
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
am: 2b1df0008a
am: b38111a0db
am: fb7c6d9173
am: ee1f46846d
am: 8486817a65
am: 0ac0157213
...
am: a06a77509b
Change-Id: Id4dda801e6a078d897c0c44dcd66231a2e6fc089
7 years ago
Chong Zhang
865b5dc8ad
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
am: a29bd6a709
am: d7c144c545
am: 3fd727d787
am: 33e76e05a3
am: dfd2808073
am: db22689ffa
...
am: 9ada6f85bf
Change-Id: I48c1ee9bd7593da5ff952f1dd5d281a30eb77702
7 years ago
Chong Zhang
a06a77509b
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
am: 2b1df0008a
am: b38111a0db
am: fb7c6d9173
am: ee1f46846d
am: 8486817a65
...
am: 0ac0157213
Change-Id: I77a86457602647bd6eeeb16582497df3ab4274aa
7 years ago
Chong Zhang
6fa5e38154
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
am: a29bd6a709
am: d7c144c545
am: 3fd727d787
am: 33e76e05a3
am: dfd2808073
...
am: db22689ffa
Change-Id: I8e581c4db0b00ab4211c3a807d0370d56bf43ea1
7 years ago
Chong Zhang
0ac0157213
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
am: 2b1df0008a
am: b38111a0db
am: fb7c6d9173
am: ee1f46846d
...
am: 8486817a65
Change-Id: I94eb3461b170d5695111ce12208713221e5ebb17
7 years ago
Chong Zhang
9ada6f85bf
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
am: a29bd6a709
am: d7c144c545
am: 3fd727d787
am: 33e76e05a3
am: dfd2808073
...
am: db22689ffa
Change-Id: Ic7105fcbfa58d46d0c33d8e8c26c6ad9cc44c960
7 years ago
Chong Zhang
db22689ffa
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
am: a29bd6a709
am: d7c144c545
am: 3fd727d787
am: 33e76e05a3
...
am: dfd2808073
Change-Id: Ia5a7017d7c4e12b8ef57017c4ff5b11d591ce8a2
7 years ago
Chong Zhang
8486817a65
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
am: 2b1df0008a
am: b38111a0db
am: fb7c6d9173
...
am: ee1f46846d
Change-Id: I7c171b235bdb3349b43824616fedde741e626fde
7 years ago
Chong Zhang
ee1f46846d
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
am: 2b1df0008a
am: b38111a0db
...
am: fb7c6d9173
Change-Id: Ib8172b10fb3e8df9310662555976cc93d90c87a4
7 years ago
Chong Zhang
dfd2808073
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
am: a29bd6a709
am: d7c144c545
am: 3fd727d787
...
am: 33e76e05a3
Change-Id: I09e13de158a6de8e283e8e62c7eafdccc562d76b
7 years ago
Chong Zhang
fb7c6d9173
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
am: 2b1df0008a
...
am: b38111a0db
Change-Id: Id28fc6a835b1e7abf7d84642cfe4a1e8cfe04edc
7 years ago
Chong Zhang
b38111a0db
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
am: 8d579abf97
...
am: 2b1df0008a
Change-Id: I2a8d904849b71156cda43aa7e44c377b34a17f10
7 years ago
Chong Zhang
33e76e05a3
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
am: a29bd6a709
am: d7c144c545
...
am: 3fd727d787
Change-Id: I4e7d44aae1663f1bc0f3d3954cccc8a6fc79bb18
7 years ago
Chong Zhang
2b1df0008a
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
am: b226bba820
...
am: 8d579abf97
Change-Id: I91ae5b377da3c8b253ef481ec66646dfcc7fa590
7 years ago
Chong Zhang
3fd727d787
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
am: a29bd6a709
...
am: d7c144c545
Change-Id: I123cc98202640afedae7854ef00daa02061f1be0
7 years ago
Chong Zhang
8d579abf97
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
am: aafbda5a18
...
am: b226bba820
Change-Id: Iab6732cf5c86c6dec646df209e0f18b6c355780e
7 years ago
Chong Zhang
d7c144c545
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
am: e1e8ea6a19
...
am: a29bd6a709
Change-Id: If392d8e94a7973026ae9f26beae944bfe7256c16
7 years ago
Chong Zhang
a29bd6a709
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
am: 0b542a3789
...
am: e1e8ea6a19
Change-Id: I10c20451e88d85fd8a9a2ba24456708ca3612f53
7 years ago
Chong Zhang
b226bba820
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
am: 5f3ac3898d
...
am: aafbda5a18
Change-Id: I22778c380e1aa3d268e8e32ff7eb2a458f46e7ef
7 years ago
Chong Zhang
e1e8ea6a19
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a
...
am: 0b542a3789
Change-Id: Ice81acc494ab5405f281f6132c39a7b64fe3e94d
7 years ago
Chong Zhang
aafbda5a18
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88
...
am: 5f3ac3898d
Change-Id: I22e4c53577164df13e5590d78dbd6796c1db06fe
7 years ago
Chong Zhang
0b542a3789
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
...
am: 998521559a
Change-Id: I5515052572a4c271ebd277b3a4c6380f5327a166
7 years ago
Chong Zhang
5f3ac3898d
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
...
am: 98248c3f88
Change-Id: I87cf81565eefd8ed299014e7aa1e10a00daefc31
7 years ago
Phil Burk
2dd56c9e2c
Merge "aaudio: fix intermittent hang and position error" into oc-dr1-dev
...
am: c1fe2634dc
Change-Id: I44d29f0bc88935ccba6b365fec242568d35f6079
7 years ago
Chong Zhang
998521559a
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev
...
am: 7da8bef65e
Change-Id: I71d87fce28528a608792b2087951d302c8ddfc21
7 years ago
Chong Zhang
98248c3f88
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
...
am: d371d08bcc
Change-Id: I6b7dcadbed62315968055d98dd2ffba3228016f9
7 years ago
Chong Zhang
7da8bef65e
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev
7 years ago
TreeHugger Robot
c1fe2634dc
Merge "aaudio: fix intermittent hang and position error" into oc-dr1-dev
7 years ago
Chong Zhang
d371d08bcc
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
7 years ago
Eino-Ville Talvala
10bd57e011
Camera3Device: Don't time out on long exposures
...
- Calculate expected duration based on request settings instead
of using a fixed timeout for shutdown
- Ensure the timeouts are always at least 5 seconds anyway
Test: Camera CTS passes with a long-exposure device
Bug: 38212789
Change-Id: I6b154710314cdc84b223f1a9f39fead9262ce27b
7 years ago
Wei Jia
e3dd4f59c8
Merge "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
am: 830ecba34d
am: ee04f896ca
am: b65bc512d1
am: 6b79fa9965
am: 29204646b9" into oc-dr1-dev-plus-aosp
...
am: d36be4e4d8
Change-Id: Ia8da3f4e146141d9c15f89e020ebe7540125431c
7 years ago
Wei Jia
9af3fd5c98
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
am: 830ecba34d
am: ee04f896ca
am: b65bc512d1
am: 6b79fa9965
am: 650446e758
...
am: 2e3ff09fc6
Change-Id: Ib2faf4e77ec0f916932ef79388da20e93eae5ed5
7 years ago
Android Build Merger (Role)
d36be4e4d8
Merge "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
am: 830ecba34d
am: ee04f896ca
am: b65bc512d1
am: 6b79fa9965
am: 29204646b9" into oc-dr1-dev-plus-aosp
7 years ago
Wei Jia
2e3ff09fc6
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
am: 830ecba34d
am: ee04f896ca
am: b65bc512d1
am: 6b79fa9965
...
am: 650446e758
Change-Id: I80ca91c7b13e441eb885287a3589f848ad910ba5
7 years ago
Wei Jia
8bd5cd6f9c
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
am: 830ecba34d
am: ee04f896ca
am: b65bc512d1
am: 6b79fa9965
...
am: 29204646b9
Change-Id: I79df2a2702df30faa4ebf9aa685c419a924c89c4
7 years ago
Wei Jia
650446e758
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
am: 830ecba34d
am: ee04f896ca
am: b65bc512d1
...
am: 6b79fa9965
Change-Id: I05c6510ddd4abd449e3bf75ec3d8ae8fdaa45917
7 years ago
Wei Jia
29204646b9
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
am: 830ecba34d
am: ee04f896ca
am: b65bc512d1
...
am: 6b79fa9965
Change-Id: I69819dad31186c037bd4d52280bf7b18c745a31f
7 years ago
Wei Jia
6b79fa9965
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
am: 830ecba34d
am: ee04f896ca
...
am: b65bc512d1
Change-Id: Id341ee30610d4c1e887a71b0deb1ddef3f325f48
7 years ago
Wei Jia
b65bc512d1
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
am: 830ecba34d
...
am: ee04f896ca
Change-Id: I06975720cf540f36b1501bf66dcf9cf16ec7512c
7 years ago
Wei Jia
ee04f896ca
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
am: 6f7295a384
...
am: 830ecba34d
Change-Id: Iac159cbf205fb02aa600d8b136e70b6d71b44924
7 years ago
Wei Jia
830ecba34d
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
am: d8192c9149
...
am: 6f7295a384
Change-Id: I7f6837cd4aced5a6d83aaf0279cc3908f80a4027
7 years ago
Wei Jia
6f7295a384
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
am: 1a1bb632e7
...
am: d8192c9149
Change-Id: I25ed67aa5671f7484dc99d3d79e0ed33125117f6
7 years ago
Wei Jia
d8192c9149
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
am: 50280c1b44
...
am: 1a1bb632e7
Change-Id: I7cd886d0bbe96dcf8aafe082649d2a9a7c1c303e
7 years ago
Wei Jia
1a1bb632e7
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6
am: 03fa67202f
am: 263d5a2a70
am: 0844e1a3e8
am: e0f4963584
am: 5cc9f8780c
am: 93ae13644b
...
am: 50280c1b44
Change-Id: Ie10440f1e789a5b8853726cd91d7705228c3b19f
7 years ago