Tianjie Xu
e170e3876b
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc am: 0b1ad23070 am: d4b4f0a1e1
...
am: 2aea56db64
2017-04-11 20:11:24 +00:00
Tianjie Xu
f4bb9db0a8
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc am: 0b1ad23070 am: d4b4f0a1e1
...
am: 2aea56db64
2017-04-11 20:11:00 +00:00
Tianjie Xu
02e7225f78
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044
...
am: 497461adc5
2017-04-11 20:11:00 +00:00
Tianjie Xu
5fa554a46a
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038
...
am: 3c3eed744e
2017-04-11 20:10:30 +00:00
Adam Lesinski
5382a520e0
Merge "ZipWriter: Keep LFH and CFH in sync" am: a309bc491d
...
am: 80d8a9350c
2017-04-11 20:05:26 +00:00
Tianjie Xu
2aea56db64
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc am: 0b1ad23070
...
am: d4b4f0a1e1
2017-04-11 20:05:01 +00:00
Tianjie Xu
3c3eed744e
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb
...
am: 2d37855038
2017-04-11 20:05:01 +00:00
Tianjie Xu
497461adc5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours
...
am: c800d82044
2017-04-11 20:05:01 +00:00
Adam Lesinski
80d8a9350c
Merge "ZipWriter: Keep LFH and CFH in sync"
...
am: a309bc491d
2017-04-11 20:00:27 +00:00
Tianjie Xu
d4b4f0a1e1
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc
...
am: 0b1ad23070
2017-04-11 19:59:59 +00:00
Tianjie Xu
2d37855038
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours
...
am: 01574980eb
2017-04-11 19:59:59 +00:00
Tianjie Xu
c800d82044
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5
...
am: 1bc2862ac5
2017-04-11 19:59:58 +00:00
Tianjie Xu
0b1ad23070
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56
...
am: afddaba0cc
2017-04-11 19:55:28 +00:00
Tianjie Xu
01574980eb
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490
...
am: cce7621064
2017-04-11 19:55:28 +00:00
Tianjie Xu
1bc2862ac5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706
...
am: ebcba388f5
2017-04-11 19:55:28 +00:00
Tianjie Xu
afddaba0cc
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc
...
am: bc8c8e4b56
2017-04-11 19:51:00 +00:00
Tianjie Xu
cce7621064
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece
...
am: df5ee70490
2017-04-11 19:50:58 +00:00
Tianjie Xu
ebcba388f5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc
...
am: 89054eb706
2017-04-11 19:50:57 +00:00
Adam Lesinski
874007d80e
Merge "libziparchive: verify that gpb flags match" into oc-dev am: 91e3f638b7
...
am: 9a43accb26
2017-04-11 19:50:00 +00:00
Jocelyn Bohr
46c74f30bb
Merge changes from topic 'trusty_km2_hal' am: a4b40020ef am: e53621c1f2 am: 31e27b7bea
...
am: e3a7584093
2017-04-11 19:49:33 +00:00
Adam Lesinski
9a43accb26
Merge "libziparchive: verify that gpb flags match" into oc-dev
...
am: 91e3f638b7
2017-04-11 19:46:33 +00:00
Tianjie Xu
bc8c8e4b56
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29
...
am: ed33065bfc
2017-04-11 19:45:58 +00:00
Tianjie Xu
df5ee70490
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374
...
am: 18ccbc2ece
2017-04-11 19:45:58 +00:00
Tianjie Xu
89054eb706
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours
...
am: de0f0b8ecc
2017-04-11 19:45:57 +00:00
Treehugger Robot
a309bc491d
Merge "ZipWriter: Keep LFH and CFH in sync"
2017-04-11 19:42:21 +00:00
Tianjie Xu
18ccbc2ece
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours
...
am: f7903d4374
2017-04-11 19:39:58 +00:00
Tianjie Xu
ed33065bfc
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434
...
am: 25c0d68d29
2017-04-11 19:39:57 +00:00
Tianjie Xu
de0f0b8ecc
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426
...
am: 556afe82f2
2017-04-11 19:39:56 +00:00
Tianjie Xu
25c0d68d29
Fix out of bound read in libziparchive am: d9fd1863f4
...
am: 6908996434
2017-04-11 19:34:28 +00:00
Tianjie Xu
556afe82f2
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours
...
am: 2b4a6de426
2017-04-11 19:34:28 +00:00
Tianjie Xu
f7903d4374
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
...
am: 368f3d273d
2017-04-11 19:34:26 +00:00
Tianjie Xu
6908996434
Fix out of bound read in libziparchive
...
am: d9fd1863f4
2017-04-11 19:29:57 +00:00
Tianjie Xu
368f3d273d
Do Not Merge: Fix out of bound read in libziparchive
...
am: a8d932f2a5
2017-04-11 19:29:57 +00:00
Tianjie Xu
2b4a6de426
Do Not Merge: Fix out of bound read in libziparchive
...
am: 6fdfd58fe1
2017-04-11 19:29:56 +00:00
Adam Lesinski
91e3f638b7
Merge "libziparchive: verify that gpb flags match" into oc-dev
2017-04-11 18:30:51 +00:00
Vijay Venkatraman
8f2c28d572
Moved include/backtrace to libbacktrace/include
...
Export libbacktrace_headers
Bug: 33241851
Test: Build sailfish
Change-Id: Iba310ffc21d17ba542bed954a960ab305037061c
2017-04-11 11:22:43 -07:00
Johan Toras Halseth
eca1b3bdcc
Move adb backup/restore helptext to adb shell bu help.
...
Key/value support for adb backup was added in ag/1946677, and help text
for adb shell bu is added in ag/2088937. This CL points the user to this
helptext instead of keeping it here, since it can quickly get out of
sync.
BUG=36170696
Test: adb
Change-Id: Ic40679f421a32e60f292ad20b726a89bfff03349
2017-04-11 19:15:17 +01:00
Dan Willemsen
dee66f5072
Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: b37312a794 am: c0fbad2b2b am: dacd341a7a -s ours
...
am: 906a5923af
2017-04-11 18:01:06 +00:00
Jocelyn Bohr
e3a7584093
Merge changes from topic 'trusty_km2_hal' am: a4b40020ef am: e53621c1f2
...
am: 31e27b7bea
2017-04-11 17:44:13 +00:00
Dan Willemsen
906a5923af
Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: b37312a794 am: c0fbad2b2b
...
am: dacd341a7a
2017-04-11 17:31:50 +00:00
Jocelyn Bohr
31e27b7bea
Merge changes from topic 'trusty_km2_hal' am: a4b40020ef
...
am: e53621c1f2
2017-04-11 17:15:32 +00:00
Dan Willemsen
dacd341a7a
Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: b37312a794
...
am: c0fbad2b2b
2017-04-11 17:06:57 +00:00
Jocelyn Bohr
e53621c1f2
Merge changes from topic 'trusty_km2_hal'
...
am: a4b40020ef
2017-04-11 17:04:45 +00:00
Dan Willemsen
c0fbad2b2b
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
...
am: b37312a794
2017-04-11 16:55:27 +00:00
Jocelyn Bohr
a4b40020ef
Merge changes from topic 'trusty_km2_hal'
...
* changes:
trusty: keymaster: update device tests to use 2.0 API
trusty: keymaster: Implement abort
trusty: keymaster: Implement finish
trusty: keymaster: Implement update
trusty: keymaster: Implement begin
trusty: keymaster: Implement upgrade_key
trusty: keymaster: Implement attest_key
trusty: keymaster: Implement export_key
trusty: keymaster: Implement import_key
trusty: keymaster: Implement get_key_characteristics
trusty: keymaster: Implement generate_key
trusty: keymaster: Implement add_rng_entropy
trusty: keymaster: Implement configure
trusty: keymaster: Begin update from Keymaster 0.3 to 2.0
2017-04-11 16:52:45 +00:00
Treehugger Robot
b37312a794
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
2017-04-11 16:19:16 +00:00
Vijay Venkatraman
88bff3613e
Moved all files from include/system to libsystem/include/system
...
Bug: 33241851
Test: No changes for modules not using VNDK. For compiling with VNDK,
add libsystem_headers as dependency for using these headers
Merged-In: I2acce0ab771e10ac83461c2f931e2c19e922089e
Change-Id: I2acce0ab771e10ac83461c2f931e2c19e922089e
2017-04-11 16:13:42 +00:00
Elliott Hughes
304635f141
Merge "Add a reasonably full implementation of gzip/gunzip/zcat." am: ca3de5562b am: a16ad5d45c am: 1f592779c5
...
am: e821e1b850
2017-04-11 16:09:54 +00:00
Elliott Hughes
e821e1b850
Merge "Add a reasonably full implementation of gzip/gunzip/zcat." am: ca3de5562b am: a16ad5d45c
...
am: 1f592779c5
2017-04-11 15:59:52 +00:00
Elliott Hughes
1f592779c5
Merge "Add a reasonably full implementation of gzip/gunzip/zcat." am: ca3de5562b
...
am: a16ad5d45c
2017-04-11 15:50:20 +00:00
