Robb Glasser
bba43b374b
Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev
2016-09-26 21:15:24 +00:00
Narayan Kamath
320a603b32
resolve merge conflicts of a47780b
to lmp-dev am: 61f27551c7
am: b5f75c4582
am: af43cd033c
-s ours am: c681771b97
am: de03f5ac26
am: 7d106d5999
am: b8f35dd70b
am: 3a53e2ce04
am: 2bbafc1f7d
...
am: 6202d11086
Change-Id: I92912bf57752fa5e5f3b252b1e7b9270700002ee
2016-09-21 17:59:52 +00:00
Narayan Kamath
6202d11086
resolve merge conflicts of a47780b
to lmp-dev am: 61f27551c7
am: b5f75c4582
am: af43cd033c
-s ours am: c681771b97
am: de03f5ac26
am: 7d106d5999
am: b8f35dd70b
am: 3a53e2ce04
...
am: 2bbafc1f7d
Change-Id: I287df6237259d23fede2752175faded26ca158f4
2016-09-21 17:56:58 +00:00
Narayan Kamath
2bbafc1f7d
resolve merge conflicts of a47780b
to lmp-dev am: 61f27551c7
am: b5f75c4582
am: af43cd033c
-s ours am: c681771b97
am: de03f5ac26
am: 7d106d5999
am: b8f35dd70b
...
am: 3a53e2ce04
Change-Id: I2bc67485c0f92960b0124067a3e9e1cd8438e712
2016-09-21 17:54:29 +00:00
Narayan Kamath
3a53e2ce04
resolve merge conflicts of a47780b
to lmp-dev am: 61f27551c7
am: b5f75c4582
am: af43cd033c
-s ours am: c681771b97
am: de03f5ac26
am: 7d106d5999
...
am: b8f35dd70b
Change-Id: I9761ac7ba5f26a1e581fa1446e6e4b36753cf424
2016-09-21 17:51:26 +00:00
Narayan Kamath
b8f35dd70b
resolve merge conflicts of a47780b
to lmp-dev am: 61f27551c7
am: b5f75c4582
am: af43cd033c
-s ours am: c681771b97
am: de03f5ac26
...
am: 7d106d5999
Change-Id: I5657567402cdce858ab88c253ba2badaa062ceca
2016-09-21 17:48:56 +00:00
Narayan Kamath
7d106d5999
resolve merge conflicts of a47780b
to lmp-dev am: 61f27551c7
am: b5f75c4582
am: af43cd033c
-s ours am: c681771b97
...
am: de03f5ac26
Change-Id: I88f747f334701d9e6daf4c18aa07051948fc0322
2016-09-21 17:46:24 +00:00
Narayan Kamath
de03f5ac26
resolve merge conflicts of a47780b
to lmp-dev am: 61f27551c7
am: b5f75c4582
am: af43cd033c
-s ours
...
am: c681771b97
Change-Id: I0fb6263aa98124acb03e79b9c102c7ee6d3e94ba
2016-09-21 17:43:54 +00:00
Narayan Kamath
c681771b97
resolve merge conflicts of a47780b
to lmp-dev am: 61f27551c7
am: b5f75c4582
...
am: af43cd033c
-s ours
Change-Id: Ifd07ba06cecf61ba53af64bae08f0dac679c9e06
2016-09-21 17:41:24 +00:00
Narayan Kamath
af43cd033c
resolve merge conflicts of a47780b
to lmp-dev am: 61f27551c7
...
am: b5f75c4582
Change-Id: Iacea86ad3c142d6f14b5fbdfb5b615f4705b1bd1
2016-09-21 17:35:52 +00:00
Narayan Kamath
b5f75c4582
resolve merge conflicts of a47780b
to lmp-dev
...
am: 61f27551c7
Change-Id: I418fb945e685e2983187c2ba43ad66ec99b468ec
2016-09-21 17:32:51 +00:00
Narayan Kamath
61f27551c7
resolve merge conflicts of a47780b
to lmp-dev
...
Test: test_zipfile with known bad files.
Change-Id: I25dde73c9b94d253c8017e441e89cb7339907c7f
2016-09-21 09:57:39 +01:00
Narayan Kamath
a47780b998
libzipfile: add additional validity checks. am: a1ec23634a
...
am: c307830f5d
Change-Id: I5d856cec4528541ff5416456cbe1338c78a09699
2016-09-21 08:26:10 +00:00
Narayan Kamath
c307830f5d
libzipfile: add additional validity checks.
...
am: a1ec23634a
Change-Id: I290e611776bd58b47266a2cb9371a832bdc0744e
2016-09-21 08:23:39 +00:00
Dan Willemsen
a1e35a5fb4
Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE
...
am: 1536654205
Change-Id: Idb1bea870de3251d7fa9682526e9634fe965424d
2016-09-20 18:21:35 +00:00
Dan Willemsen
1536654205
Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE
...
When building without vendor/... in the tree, we won't be creating a
vendorimage, so BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE won't be defined. But
we still need to use the vendor image that will be present.
Bug: 31545062
Bug: 30040825
Change-Id: I756adc615aea11da60da4d3a4568caca9fed93ab
2016-09-20 09:46:42 -07:00
Mark Salyzyn
1723f3fcd1
Revert "Restrict pmsg use to eng builds."
...
This reverts commit f894b96a92
.
Kernel binaries have incorporated the performance-enhanced pmsg driver
that has removed the bounce buffer.
Bug: 31057326
Bug: 30375418
Change-Id: Id6cec3ac144f57e8e5465aa48bbdc829cf29e283
2016-09-20 16:19:41 +00:00
Narayan Kamath
a1ec23634a
libzipfile: add additional validity checks.
...
- Make sure the start and end of the data for a given entry are
within the allocated buffer.
- Make sure all central directory entries start and end within the
central directory buffer.
- Reject zip file entries that have no filenames.
bug: 30916186
test: test_zipfile with known bad zip files.
Change-Id: Ibf3f6469e60c85ec1608f5ce613d40867d2d09b7
2016-09-13 16:08:38 +01:00
Mark Salyzyn
c11b9e1e31
liblog: add __android_log_close() am: b1b5d507cb
am: f72c9bc42d
am: 49d5582f29
am: 1b1b6a4889
-s ours am: 4eb04cb32b
...
am: 38f72ac44a
Change-Id: I0ad2d50b03195b3742f4404119f82b068d610cfe
2016-09-08 09:21:54 +00:00
Mark Salyzyn
38f72ac44a
liblog: add __android_log_close() am: b1b5d507cb
am: f72c9bc42d
am: 49d5582f29
am: 1b1b6a4889
-s ours
...
am: 4eb04cb32b
Change-Id: Ia6da02026a7e8cb0374cdfccd4f2a98c78360cc1
2016-09-08 09:15:12 +00:00
Mark Salyzyn
4eb04cb32b
liblog: add __android_log_close() am: b1b5d507cb
am: f72c9bc42d
am: 49d5582f29
...
am: 1b1b6a4889
-s ours
Change-Id: I21849cf64861536e911f94d95181822ffb06805c
2016-09-08 09:05:14 +00:00
Mark Salyzyn
1b1b6a4889
liblog: add __android_log_close() am: b1b5d507cb
am: f72c9bc42d
...
am: 49d5582f29
Change-Id: I11566801e6b467394b41dad598b697ceb43c9acf
2016-09-08 08:44:07 +00:00
Mark Salyzyn
49d5582f29
liblog: add __android_log_close() am: b1b5d507cb
...
am: f72c9bc42d
Change-Id: I144b6ef420fadb6155f5a1b367c58d26ca1dfaac
2016-09-08 08:40:25 +00:00
Mark Salyzyn
f72c9bc42d
liblog: add __android_log_close()
...
am: b1b5d507cb
Change-Id: I5d6a6e97960e88e6f668b6376ec296d7452ec1dc
2016-09-08 08:30:54 +00:00
Mark Salyzyn
99296d0ef6
liblog: add __android_log_close() am: bd36696a16
...
am: 56dffbcffa
Change-Id: Ife62a0d684726467c6501f3d9f8fb5f287513093
2016-09-08 07:43:50 +00:00
Mark Salyzyn
56dffbcffa
liblog: add __android_log_close()
...
am: bd36696a16
Change-Id: I2668ee6168327f1a8283b0d2cf646e6ab9d1d219
2016-09-08 07:40:08 +00:00
TreeHugger Robot
d8ce1bf1ec
Merge "Added a NETWORK trace tag." into nyc-mr1-dev
2016-09-08 00:34:19 +00:00
Mark Salyzyn
bd36696a16
liblog: add __android_log_close()
...
Bug: 30963384
(cherry picked from commit df7a4c6bae
)
(cherry picked from commit c12d3d250ceb6a4380d2fcaf7f6d30bdea200dad)
Change-Id: Id4313e99bf86b41c3713e1c2db0242d12aeb8bb7
2016-09-07 20:49:08 +01:00
Felipe Leme
785735bde1
Added a NETWORK trace tag.
...
BUG: 31281543
Change-Id: I4d7c7fc26c77fec099bbf0f9426e3a9f3a722e6d
2016-09-07 12:47:18 -07:00
Narayan Kamath
e3b604de11
Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007
am: 2f16f2b9b3
am: 0f6c4a0e8f
am: ffb34de445
am: baa3f2bdb2
am: 8013db9c75
am: a55e9f01fb
am: e5a1c7d8e4
am: ed4d8ac634
...
am: 309dde12b3
Change-Id: I20ad1256a5cfee50338755eccf3efe3fbbfab074
2016-09-07 19:27:21 +00:00
Mark Salyzyn
9a94f3b1e3
liblog: add __android_log_close() am: 2d14969155
am: 3b2fa3eaef
am: 7b16dcf969
am: 94ebdd6b39
am: 5f04ac60d6
am: 4d12c20a5e
am: e09c5d2ce4
am: 68afb4588f
-s ours am: 3213ec221c
...
am: c006a8c832
Change-Id: Ia712f681bdd10e4943fb86172e5dcd76f04aaada
2016-09-07 19:27:20 +00:00
Narayan Kamath
309dde12b3
Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007
am: 2f16f2b9b3
am: 0f6c4a0e8f
am: ffb34de445
am: baa3f2bdb2
am: 8013db9c75
am: a55e9f01fb
am: e5a1c7d8e4
...
am: ed4d8ac634
Change-Id: I522040759651064ca12b337f9bc0c10d946cdb30
2016-09-07 19:24:26 +00:00
Mark Salyzyn
c006a8c832
liblog: add __android_log_close() am: 2d14969155
am: 3b2fa3eaef
am: 7b16dcf969
am: 94ebdd6b39
am: 5f04ac60d6
am: 4d12c20a5e
am: e09c5d2ce4
am: 68afb4588f
-s ours
...
am: 3213ec221c
Change-Id: I743a0b3fad9d45b4546e1e9217e3999780b1595f
2016-09-07 19:24:26 +00:00
Narayan Kamath
ed4d8ac634
Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007
am: 2f16f2b9b3
am: 0f6c4a0e8f
am: ffb34de445
am: baa3f2bdb2
am: 8013db9c75
am: a55e9f01fb
...
am: e5a1c7d8e4
Change-Id: I9781dceedf14851071757cdc3c63c3be06bf2d1f
2016-09-07 19:22:11 +00:00
Mark Salyzyn
3213ec221c
liblog: add __android_log_close() am: 2d14969155
am: 3b2fa3eaef
am: 7b16dcf969
am: 94ebdd6b39
am: 5f04ac60d6
am: 4d12c20a5e
am: e09c5d2ce4
...
am: 68afb4588f
-s ours
Change-Id: I6b817000bb5ed02a4a81a5caf7b73f415519df68
2016-09-07 19:21:53 +00:00
Mark Salyzyn
b1b5d507cb
liblog: add __android_log_close()
...
Bug: 30963384
(cherry picked from commit df7a4c6bae
)
Change-Id: Ide70df3c04e29301649a1ca234b1b0af687bcbfb
2016-09-07 20:17:39 +01:00
Mark Salyzyn
9f8d3d32cf
liblog: add __android_log_close() am: c68706fe49
am: edc5507f76
am: 85b0dd64f1
-s ours am: ef661e0a6d
am: 1b6b34717a
am: edbf5d59f0
am: 1b9ae6eae6
am: cfea0949a4
am: 87f09ae506
am: c1197f5b67
am: f3af4388fb
am: 356988f1d7
...
am: b8218ee845
Change-Id: I49d29172653f5e471d1b0bfbbbd68757de564a0e
2016-09-07 19:17:11 +00:00
Narayan Kamath
e5a1c7d8e4
Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007
am: 2f16f2b9b3
am: 0f6c4a0e8f
am: ffb34de445
am: baa3f2bdb2
am: 8013db9c75
...
am: a55e9f01fb
Change-Id: If64261d4be388b1879d5aea5d91dc77a7ec7a693
2016-09-07 19:16:24 +00:00
Mark Salyzyn
68afb4588f
liblog: add __android_log_close() am: 2d14969155
am: 3b2fa3eaef
am: 7b16dcf969
am: 94ebdd6b39
am: 5f04ac60d6
am: 4d12c20a5e
...
am: e09c5d2ce4
Change-Id: Id19b06af22568f6fa70e9d1b381a4d8ce5b595d0
2016-09-07 19:16:23 +00:00
Narayan Kamath
a55e9f01fb
Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007
am: 2f16f2b9b3
am: 0f6c4a0e8f
am: ffb34de445
am: baa3f2bdb2
...
am: 8013db9c75
Change-Id: If9798691ad5a4db7928b50c6c2ce39745c113f74
2016-09-07 19:13:53 +00:00
Mark Salyzyn
e09c5d2ce4
liblog: add __android_log_close() am: 2d14969155
am: 3b2fa3eaef
am: 7b16dcf969
am: 94ebdd6b39
am: 5f04ac60d6
...
am: 4d12c20a5e
Change-Id: Ie41afcef1401543ed3f05dce2834a31487bdc892
2016-09-07 19:13:53 +00:00
Mark Salyzyn
b8218ee845
liblog: add __android_log_close() am: c68706fe49
am: edc5507f76
am: 85b0dd64f1
-s ours am: ef661e0a6d
am: 1b6b34717a
am: edbf5d59f0
am: 1b9ae6eae6
am: cfea0949a4
am: 87f09ae506
am: c1197f5b67
am: f3af4388fb
...
am: 356988f1d7
Change-Id: Ie06c87f64bf9048187ba823d9831f606ffe24e0a
2016-09-07 19:12:14 +00:00
Narayan Kamath
8013db9c75
Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007
am: 2f16f2b9b3
am: 0f6c4a0e8f
am: ffb34de445
...
am: baa3f2bdb2
Change-Id: I1aba19963e78ce071e588687451f51fd860f664e
2016-09-07 19:11:23 +00:00
Mark Salyzyn
4d12c20a5e
liblog: add __android_log_close() am: 2d14969155
am: 3b2fa3eaef
am: 7b16dcf969
am: 94ebdd6b39
...
am: 5f04ac60d6
Change-Id: Ib449f7dd39aff26e47feab9796fac140152bae75
2016-09-07 19:11:22 +00:00
Mark Salyzyn
356988f1d7
liblog: add __android_log_close() am: c68706fe49
am: edc5507f76
am: 85b0dd64f1
-s ours am: ef661e0a6d
am: 1b6b34717a
am: edbf5d59f0
am: 1b9ae6eae6
am: cfea0949a4
am: 87f09ae506
am: c1197f5b67
...
am: f3af4388fb
Change-Id: I9007b8e48a2e439b6b2e1749e386c47c8adad24c
2016-09-07 19:08:56 +00:00
Narayan Kamath
baa3f2bdb2
Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007
am: 2f16f2b9b3
am: 0f6c4a0e8f
...
am: ffb34de445
Change-Id: I891a8ad2eebed4d7279ad582fef40bf1a72ff9b0
2016-09-07 19:08:53 +00:00
Mark Salyzyn
5f04ac60d6
liblog: add __android_log_close() am: 2d14969155
am: 3b2fa3eaef
am: 7b16dcf969
...
am: 94ebdd6b39
Change-Id: I233e56242e7ef5c07e288c0e2baa11dfa0edf55a
2016-09-07 19:08:52 +00:00
Mark Salyzyn
f3af4388fb
liblog: add __android_log_close() am: c68706fe49
am: edc5507f76
am: 85b0dd64f1
-s ours am: ef661e0a6d
am: 1b6b34717a
am: edbf5d59f0
am: 1b9ae6eae6
am: cfea0949a4
am: 87f09ae506
...
am: c1197f5b67
Change-Id: I9ec591fe17b1b8434728751654bd4f05e1556698
2016-09-07 19:06:43 +00:00
Narayan Kamath
ffb34de445
Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007
am: 2f16f2b9b3
...
am: 0f6c4a0e8f
Change-Id: I1655bfde9e7a640f7087c891f0f5ad1b618fc9d9
2016-09-07 19:05:19 +00:00
Mark Salyzyn
94ebdd6b39
liblog: add __android_log_close() am: 2d14969155
am: 3b2fa3eaef
...
am: 7b16dcf969
Change-Id: Id17cdb4600a081c5fc0442cb244d65021dd0dbb6
2016-09-07 19:05:18 +00:00