OSDN Git Service
Marco Nelissen [Thu, 14 Sep 2017 00:47:18 +0000 (00:47 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am:
08ef71975b am:
d6768a3f03 am:
6705aadd4b am:
04cb1d7f53 am:
57f4543970
am:
4363301afe
Change-Id: Ie5f76651551906523c6413ae53ec3f002f108e1b
Marco Nelissen [Wed, 13 Sep 2017 23:23:55 +0000 (23:23 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am:
08ef71975b am:
d6768a3f03 am:
6705aadd4b am:
04cb1d7f53
am:
57f4543970
Change-Id: I9360a01c8a10eac5523f7307366d232e711ae23d
Marco Nelissen [Wed, 13 Sep 2017 22:28:23 +0000 (22:28 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am:
08ef71975b am:
d6768a3f03 am:
6705aadd4b
am:
04cb1d7f53
Change-Id: Ib2773de7e003ab14d18e5b8c8f70e4800e0cfc63
Marco Nelissen [Wed, 13 Sep 2017 20:47:25 +0000 (20:47 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am:
08ef71975b am:
d6768a3f03
am:
6705aadd4b
Change-Id: Idadacc9024cb424c771f546b4a9bdec6fff7c6b4
Marco Nelissen [Wed, 13 Sep 2017 20:36:28 +0000 (20:36 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am:
08ef71975b
am:
d6768a3f03
Change-Id: Iafba587d46764fb47a425d602172cb1c82636d52
Marco Nelissen [Wed, 13 Sep 2017 20:08:06 +0000 (20:08 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev
am:
08ef71975b
Change-Id: I73ec3365c21238f7ca328763df52121b43911e04
Marco Nelissen [Wed, 13 Sep 2017 05:01:24 +0000 (05:01 +0000)]
Merge "media: Fix a typo in parsing nclc atom." into nyc-dev
Andy Hung [Mon, 11 Sep 2017 22:35:53 +0000 (22:35 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2 am:
74f84d987b am:
355a18f58d am:
c8f3cf02eb am:
8cad724158
am:
122ec92c42
Change-Id: Ifa8953ad8057a4d7dcddeae1793e00168ea90c58
Andy Hung [Mon, 11 Sep 2017 22:33:46 +0000 (22:33 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2 am:
74f84d987b am:
355a18f58d am:
c8f3cf02eb
am:
8cad724158
Change-Id: I1d0102e75a068bd6a2af21b9126b907703928db7
Andy Hung [Mon, 11 Sep 2017 22:32:15 +0000 (22:32 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2 am:
74f84d987b am:
355a18f58d
am:
c8f3cf02eb
Change-Id: I7c984be87df715dbc6fe5ecc44691e001d7ff09f
Ray Essick [Mon, 11 Sep 2017 22:30:15 +0000 (22:30 +0000)]
Merge "Put media.metrics service into proper group" into oc-dev
am:
0990056439
Change-Id: Ied8c03cba54639871ac175fe71df11b2b0f348c6
Andy Hung [Mon, 11 Sep 2017 22:24:48 +0000 (22:24 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2 am:
74f84d987b
am:
355a18f58d
Change-Id: I5f3a24175f1aa70fb1f8d62a449685e9103cad18
TreeHugger Robot [Mon, 11 Sep 2017 22:24:09 +0000 (22:24 +0000)]
Merge "Put media.metrics service into proper group" into oc-dev
Andy Hung [Mon, 11 Sep 2017 22:21:26 +0000 (22:21 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415 am:
d08327d1a2
am:
74f84d987b
Change-Id: Ie2c1acfdc523c6774dd2f90e0b42a9f274731d57
Andy Hung [Mon, 11 Sep 2017 22:17:17 +0000 (22:17 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454 am:
b995c31415
am:
d08327d1a2
Change-Id: Ia8bdb1eae19450a3c6df255945a8cded55b15909
Andy Hung [Mon, 11 Sep 2017 22:15:47 +0000 (22:15 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474 am:
ae465be454
am:
b995c31415
Change-Id: Iff099acd6ee928f37d2b91144a06d9c78a2a5aae
Andy Hung [Mon, 11 Sep 2017 22:13:42 +0000 (22:13 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100 am:
0a8a0c4474
am:
ae465be454
Change-Id: I272012f714615091a24a9d3bf8a0d2d825576bcf
Andy Hung [Mon, 11 Sep 2017 22:12:13 +0000 (22:12 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am:
e472e51100
am:
0a8a0c4474
Change-Id: Icf690ebbc582d61f4369ef208aa150e2aa0c38d7
Andy Hung [Mon, 11 Sep 2017 22:10:43 +0000 (22:10 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev
am:
e472e51100
Change-Id: I82f359a057762b8b0fac97d137a2fb20083a518b
Andy Hung [Mon, 11 Sep 2017 22:01:44 +0000 (22:01 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev
Hangyu Kuang [Fri, 19 Aug 2016 20:49:43 +0000 (13:49 -0700)]
media: Fix a typo in parsing nclc atom.
Bug:
30974361
bug:
64836941
Change-Id: I12a75ed30d3259d863e744fae3ccff79d8a95f39
(cherry picked from commit
51a0ff56f49faf1a19281f6d786fe18bf84794c6)
Dongwon Kang [Mon, 11 Sep 2017 17:21:23 +0000 (17:21 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours am:
177ee220b9 -s ours am:
c66d4db705 -s ours am:
6b936f54ff -s ours am:
75612faf76 -s ours am:
e06a7d69ca -s ours
am:
5161533fee -s ours
Change-Id: I2221beaf11f6cca0bb450ebfc7947149a929ab50
Ray Essick [Thu, 7 Sep 2017 19:34:50 +0000 (12:34 -0700)]
Put media.metrics service into proper group
specify a group for the media.metrics service.
the unspecified default is inappropriate.
Bug:
65334712
Bug:
65540999
Test: examination of /proc info for metrics
Change-Id: I0e35a2d676586216bcfee672666803b7fa5eae4d
(cherry picked from commit
a61dff07b71b6999f30c2a15268d8a4d87d4ce48)
Dongwon Kang [Mon, 11 Sep 2017 17:17:16 +0000 (17:17 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours am:
177ee220b9 -s ours am:
c66d4db705 -s ours am:
6b936f54ff -s ours am:
75612faf76 -s ours
am:
e06a7d69ca -s ours
Change-Id: Iae608559bb37e15da1287113b7f82a9446020996
Dongwon Kang [Mon, 11 Sep 2017 17:13:52 +0000 (17:13 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours am:
177ee220b9 -s ours am:
c66d4db705 -s ours am:
6b936f54ff -s ours
am:
75612faf76 -s ours
Change-Id: Iad00100a6e9b8f79a648c7a35b57d41d7fafdcfb
Dongwon Kang [Mon, 11 Sep 2017 17:10:15 +0000 (17:10 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours am:
177ee220b9 -s ours am:
c66d4db705 -s ours
am:
6b936f54ff -s ours
Change-Id: I28559dc35dc859153adc69563b529c74f324a5e7
Dongwon Kang [Mon, 11 Sep 2017 17:07:13 +0000 (17:07 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours am:
177ee220b9 -s ours
am:
c66d4db705 -s ours
Change-Id: Id1e1ec84d35e12a3ae7ee0e991bcf7729a5e4377
Dongwon Kang [Mon, 11 Sep 2017 17:03:14 +0000 (17:03 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3 am:
57c83e2226 -s ours
am:
177ee220b9 -s ours
Change-Id: I674316a0d0ad9ff64efdb3593d5da3b2d8183a28
Dongwon Kang [Mon, 11 Sep 2017 16:59:44 +0000 (16:59 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939 am:
410f48c5e3
am:
57c83e2226 -s ours
Change-Id: Id48471463e916b66034956540ffcef7341ac9a9b
Dongwon Kang [Mon, 11 Sep 2017 16:57:03 +0000 (16:57 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3 am:
fbaadabfdf am:
3e2eac8b68 am:
0c799a519f am:
2a3f4e31ee -s ours
am:
dcdf6352be -s ours
Change-Id: I47f02ea51098794741a434f03cbd70718b55d7ef
Dongwon Kang [Mon, 11 Sep 2017 16:56:15 +0000 (16:56 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0 am:
e77ea73939
am:
410f48c5e3
Change-Id: I57d9148bfc3ced57c2b12453f68e45d40523034f
Dongwon Kang [Mon, 11 Sep 2017 16:56:12 +0000 (16:56 +0000)]
Block allocateBufferWithBackup in secure native handle mode am:
528c7dd7c2 am:
9b14c30565 am:
9f7e205a80 am:
9eeb7cb2fd am:
5c1e5ec1b2 -s ours
am:
45a67c93eb
Change-Id: I98ec64b31b297c9eb0ab87dd357d8168f78dd296
Dongwon Kang [Mon, 11 Sep 2017 16:53:11 +0000 (16:53 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3 am:
fbaadabfdf am:
3e2eac8b68 am:
0c799a519f
am:
2a3f4e31ee -s ours
Change-Id: I3b0343bb57ce02886bc322f726ba684ab6bf3979
Dongwon Kang [Mon, 11 Sep 2017 16:52:42 +0000 (16:52 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev am:
659a498ca0
am:
e77ea73939
Change-Id: Ia635461b9881a8d74d48f55c2bb0ccf50c2a1383
Dongwon Kang [Mon, 11 Sep 2017 16:52:39 +0000 (16:52 +0000)]
Block allocateBufferWithBackup in secure native handle mode am:
528c7dd7c2 am:
9b14c30565 am:
9f7e205a80 am:
9eeb7cb2fd
am:
5c1e5ec1b2 -s ours
Change-Id: I232e634625b7f3d6a05e0737ca636b8e6a47e0d2
Andy Hung [Mon, 11 Sep 2017 16:50:35 +0000 (16:50 +0000)]
Merge "EffectBundle: Check parameter and value size" into oc-dev
am:
4464401d1b
Change-Id: I54ef3f8563289144ff43a6b42776541dd6a999dc
Dongwon Kang [Mon, 11 Sep 2017 16:49:18 +0000 (16:49 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev
am:
659a498ca0
Change-Id: If10318296ec8fbb5448e37e639ca5b031db5a912
Dongwon Kang [Mon, 11 Sep 2017 16:49:15 +0000 (16:49 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3 am:
fbaadabfdf am:
3e2eac8b68
am:
0c799a519f
Change-Id: Ic526f0640f99a7c71eec90bf866479cc7e3b3963
Dongwon Kang [Mon, 11 Sep 2017 16:49:15 +0000 (16:49 +0000)]
Track graphic buffer mode in OMXNodeInstance
am:
f630233ee4
Change-Id: I3e1810c85e4a153f97ff0e4b2168c21e4e00a4b1
Dongwon Kang [Mon, 11 Sep 2017 16:45:16 +0000 (16:45 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3 am:
fbaadabfdf
am:
3e2eac8b68
Change-Id: Ia127d32339353934323bc776d24a6b15225c3332
Dongwon Kang [Mon, 11 Sep 2017 16:41:41 +0000 (16:41 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev am:
df11b20fd3
am:
fbaadabfdf
Change-Id: I740abcbf02ddfcb7d61747396b75fd2dcaf1920d
Dongwon Kang [Mon, 11 Sep 2017 16:41:38 +0000 (16:41 +0000)]
Block allocateBufferWithBackup in secure native handle mode am:
528c7dd7c2 am:
9b14c30565 am:
9f7e205a80
am:
9eeb7cb2fd
Change-Id: I63631c29a43fa5b0fad0bd626138328f7e63b50e
Dongwon Kang [Mon, 11 Sep 2017 16:38:18 +0000 (16:38 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev
am:
df11b20fd3
Change-Id: I3410126b00d0ab7436633ebc858d4153b2ba3d7c
Dongwon Kang [Mon, 11 Sep 2017 16:38:08 +0000 (16:38 +0000)]
Block allocateBufferWithBackup in secure native handle mode am:
528c7dd7c2 am:
9b14c30565
am:
9f7e205a80
Change-Id: Ifa7f56a0f34b5cf9068f804b5a97beb018ee4aec
Andy Hung [Mon, 11 Sep 2017 16:36:50 +0000 (16:36 +0000)]
Merge "EffectBundle: Check parameter and value size" into oc-dev
Dongwon Kang [Mon, 11 Sep 2017 16:35:30 +0000 (16:35 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into mnc-dev
Dongwon Kang [Mon, 11 Sep 2017 16:34:59 +0000 (16:34 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev
Dongwon Kang [Mon, 11 Sep 2017 16:34:39 +0000 (16:34 +0000)]
Block allocateBufferWithBackup in secure native handle mode am:
528c7dd7c2
am:
9b14c30565
Change-Id: Iad77f455e6f20065af28e2482457f396d0aa1631
Dongwon Kang [Mon, 11 Sep 2017 16:31:37 +0000 (16:31 +0000)]
Block allocateBufferWithBackup in secure native handle mode
am:
528c7dd7c2
Change-Id: Id35842dd006cb7fa8607793c85a91eb534f577d1
Dongwon Kang [Wed, 26 Jul 2017 20:55:59 +0000 (13:55 -0700)]
Track graphic buffer mode in OMXNodeInstance
Test: CtsMediaTestCases & YT & Play Movies & Cast
Bug:
62948670
Merged-In: Icbd9b767f1aef005819e680f77f4a05041988f34
Change-Id: Icbd9b767f1aef005819e680f77f4a05041988f34
Dongwon Kang [Wed, 26 Jul 2017 20:55:59 +0000 (13:55 -0700)]
Track graphic buffer mode in OMXNodeInstance
Test: cts-tradefed run cts -p android.media & YT & Play Movies & Cast
Bug:
62948670
Merged-In: Icbd9b767f1aef005819e680f77f4a05041988f34
Change-Id: Icbd9b767f1aef005819e680f77f4a05041988f34
Dongwon Kang [Wed, 26 Jul 2017 20:55:59 +0000 (13:55 -0700)]
Track graphic buffer mode in OMXNodeInstance
Test: CtsMediaTestCases & YT & Play Movies & Cast
Bug:
62948670
Merged-In: Icbd9b767f1aef005819e680f77f4a05041988f34
Change-Id: Icbd9b767f1aef005819e680f77f4a05041988f34
Dongwon Kang [Tue, 15 Aug 2017 18:47:21 +0000 (11:47 -0700)]
Block allocateBufferWithBackup in secure native handle mode
Bug:
63522818
Test: CtsMediaTestCases & YT & Play Movies & Cast
Change-Id: I2be2748ecabf49d7842a90676e68978bf0c56b71
Andy Hung [Fri, 18 Aug 2017 02:00:57 +0000 (19:00 -0700)]
EffectBundle: Check parameter and value size
Test: POC CTS AudioEffectTest
Bug:
64477217
Bug:
64478003
Change-Id: Ia5e6ecb5a356daf5f3fa085d1055748f638795d9
Dongwon Kang [Wed, 16 Aug 2017 19:40:28 +0000 (19:40 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8 am:
9c9386918a am:
924b20fa49
am:
654bf4f8e9
Change-Id: I18a3052d9fc3c7dd78277ff239e54ca616ceae0f
Dongwon Kang [Wed, 16 Aug 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8 am:
9c9386918a
am:
924b20fa49
Change-Id: I2ea0e0a01595908ecc85c06d3cdd5ff82cd03346
Dongwon Kang [Wed, 16 Aug 2017 19:33:25 +0000 (19:33 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8
am:
9c9386918a
Change-Id: I71801ac3e19e71f6f93800754bd07752af976292
Dongwon Kang [Wed, 16 Aug 2017 19:28:56 +0000 (19:28 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8
am:
d1c36259d8
Change-Id: Ia8c09dfc98c5970b5ee8f67873e0ffd2035c9418
Dongwon Kang [Wed, 16 Aug 2017 19:20:29 +0000 (19:20 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce
am:
29ac52e4e8
Change-Id: I3bea1b6ec413cb65b49b5318c64ce0979453db5f
Dongwon Kang [Wed, 16 Aug 2017 19:14:53 +0000 (19:14 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4
am:
3775c0c2ce
Change-Id: I9a2a3028bc8d2623d269fc6ac4dec1611361d9f5
Dongwon Kang [Wed, 16 Aug 2017 19:11:23 +0000 (19:11 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8
am:
68f3d037b4
Change-Id: Ife2921f9fe3c14f13b7a13377b8f54249979f939
Dongwon Kang [Wed, 16 Aug 2017 19:08:23 +0000 (19:08 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570
am:
c0fc9412f8
Change-Id: I4decd70a4b16e0afc8b2177d955280107c5f01aa
Dongwon Kang [Wed, 16 Aug 2017 19:04:23 +0000 (19:04 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7
am:
b7d875f570
Change-Id: Idd819bf765bf0da09c1995f99072822b8127ccc8
Dongwon Kang [Wed, 16 Aug 2017 19:00:51 +0000 (19:00 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d
am:
395c7417a7
Change-Id: I6c6f140b5d164ce5e7e0fa7206016e0ce80a8396
Dongwon Kang [Wed, 16 Aug 2017 18:57:53 +0000 (18:57 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d
am:
49903e4e0d
Change-Id: I4896ddcb270fe1c07e2f70e70eea99946e5c2ac1
Dongwon Kang [Wed, 16 Aug 2017 18:54:54 +0000 (18:54 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e
am:
5b89f4af6d
Change-Id: Iaf9973226c72e46e7bf976e7917c102e737516b2
Dongwon Kang [Wed, 16 Aug 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169
am:
0d7d0ab16e
Change-Id: If958b023d571cabf9b180daaa6f7049e148cbe35
Dongwon Kang [Wed, 16 Aug 2017 18:43:50 +0000 (18:43 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f
am:
f84e9b9169
Change-Id: Ic4b40082b3a42c470e4cea5d7efb19c32ba47030
Dongwon Kang [Wed, 16 Aug 2017 18:40:50 +0000 (18:40 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c
am:
5dfd2b5d9f
Change-Id: I353d7057154a79d1ef44614450e75d123885be27
Lajos Molnar [Wed, 16 Aug 2017 18:37:22 +0000 (18:37 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
79220ea724
am:
9c65df568a
Change-Id: I26f78990d18738d800397531b9bbef810c7d125d
Dongwon Kang [Wed, 16 Aug 2017 18:32:19 +0000 (18:32 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev
am:
c65287a08c
Change-Id: I4b97f1df29bc3a2be401542be525c85880987b9b
Android Build Merger (Role) [Wed, 16 Aug 2017 18:31:42 +0000 (18:31 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
79220ea724
Change-Id: Ic000a7d1436b22416496a57a337827be4fe62523
Lajos Molnar [Wed, 16 Aug 2017 18:30:23 +0000 (18:30 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
0868c86c78
am:
61a0addea2
Change-Id: I8b86ade94fa2ed09063f67565916aebf506c3817
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:32 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
0868c86c78
Change-Id: I0d3d98b5431db0a3bda7e1f3e9bdd41ef655227b
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:28 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
1fdf6d7aed
Change-Id: Idc9e6f02e5577c6ef504cb6ccf892cff71d04049
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:23 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am:
91144e452f
Change-Id: I88bdd26f00c3a85b19eb5708d946a3d280191eac
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:18 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c
Change-Id: Ib61e6205a19fd587ed006245d490b1a83b95adcf
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:14 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee
Change-Id: Ifb3a880e644220deb0049317f56bb6946fbad256
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:10 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704
Change-Id: Id8f2a4db1283fdd1fac8376c4e52566347ab6fa9
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:05 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb
Change-Id: I9e8e351a90cebbe87a755fc9ddcd5d06d7b37add
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:00 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82
Change-Id: I3042941f91290fdca070bcaa5cd00de36deb5d16
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:56 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae
Change-Id: I3bed8696d76f4d08d059fd74e5e85b3d361a4c77
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:51 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0
Change-Id: Iba67f3a765f9398b8ce0c2b90aa13be1a9669ba7
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:46 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec
Change-Id: I8523a6a7220d1b6022965cd7df1b736b06aeee02
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:42 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0
Change-Id: I203f15b2b318b43ef01ab2e741a2cec7a5a55e5c
Lajos Molnar [Wed, 16 Aug 2017 18:19:15 +0000 (18:19 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev
am:
9e41bec8d3 -s ours
Change-Id: I8e3a43273b89ae97ccba0715d99e9dc5286821ef
Dongwon Kang [Wed, 16 Aug 2017 18:11:52 +0000 (18:11 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev am:
7286ecc232
am:
7cc3a167fa
Change-Id: Ie8def259a635c2b080541f5402731ba1f02e88e7
Dongwon Kang [Wed, 16 Aug 2017 18:09:00 +0000 (18:09 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev
am:
7286ecc232
Change-Id: Ib53b5fb2056d318d79ffa52aafd1f50d3d9c5123
Dongwon Kang [Wed, 16 Aug 2017 18:08:24 +0000 (18:08 +0000)]
Merge changes from topic "am-
793ae1d1-008c-4cc0-9717-
ce9555544b26" into oc-dev
am:
6df241a03e
Change-Id: I86c0ecb695b09c77e06af66afee1ebc48a9453e7
TreeHugger Robot [Wed, 16 Aug 2017 17:52:07 +0000 (17:52 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev
TreeHugger Robot [Wed, 16 Aug 2017 17:52:07 +0000 (17:52 +0000)]
Merge changes from topic "am-
793ae1d1-008c-4cc0-9717-
ce9555544b26" into oc-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
00209af1ec
Check buffer size in useBuffer in software components
Dongwon Kang [Wed, 16 Aug 2017 02:20:20 +0000 (02:20 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am: 886a1 am:
3ca83cf1b3
am:
6a53272e6f
Change-Id: I2daeea1b47b32953fb4ea3f4860bff6819df42ec
Android Build Merger (Role) [Wed, 16 Aug 2017 02:12:58 +0000 (02:12 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am: 886a1 am:
3ca83cf1b3
Change-Id: If5b9d8616aa3b783109dff6ee30c537ce849edd4
Dongwon Kang [Wed, 16 Aug 2017 02:11:46 +0000 (02:11 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am: 886a1 am:
350f941d70
am:
6cdeb3b0d0
Change-Id: I8abfa884ae221f47e8e206ad8fd0f51b28b2b304
Android Build Merger (Role) [Wed, 16 Aug 2017 01:59:11 +0000 (01:59 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am: 886a1 am:
350f941d70
Change-Id: I680b406b826b4ad7db534e8fe12b994aced6654d
Android Build Merger (Role) [Wed, 16 Aug 2017 01:59:07 +0000 (01:59 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am:
886a1ef47a
Change-Id: I236cb6d5c2b3fc9b43159ac08b0018d048287d50
Android Build Merger (Role) [Wed, 16 Aug 2017 01:59:01 +0000 (01:59 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f
Change-Id: Icf3c5f2a24169d2fb62774b1f82bfa61ce6a4959
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:55 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0
Change-Id: I3d08f7d93bf04a5435e9360cd26dd1fd3b442dc3
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:51 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6
Change-Id: Ic6af6c07fdcf25e7ac862da9658b045860beca6a
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:46 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d
Change-Id: I2ab1da7b98c9dce50fca6113eee2d656d2c402de
OSDN Git Service
