Commits · 320a603b3272dfe93f1934dd647ce16d342daaa2 · halo / system_core

21 Sep, 2016 13 commits

resolve merge conflicts of to lmp-dev am: am: ... · 320a603b

Narayan Kamath authored 8 years ago

resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 am: b5f75c45 am: af43cd03 -s ours am: c681771b am: de03f5ac am: 7d106d59 am: b8f35dd7 am: 3a53e2ce am: 2bbafc1f
am: 6202d110

Change-Id: I92912bf57752fa5e5f3b252b1e7b9270700002ee

320a603b

resolve merge conflicts of to lmp-dev am: am: ... · 6202d110

Narayan Kamath authored 8 years ago

resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 am: b5f75c45 am: af43cd03 -s ours am: c681771b am: de03f5ac am: 7d106d59 am: b8f35dd7 am: 3a53e2ce
am: 2bbafc1f

Change-Id: I287df6237259d23fede2752175faded26ca158f4

6202d110

resolve merge conflicts of to lmp-dev am: am: ... · 2bbafc1f

Narayan Kamath authored 8 years ago

resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 am: b5f75c45 am: af43cd03 -s ours am: c681771b am: de03f5ac am: 7d106d59 am: b8f35dd7
am: 3a53e2ce

Change-Id: I2bc67485c0f92960b0124067a3e9e1cd8438e712

2bbafc1f

resolve merge conflicts of to lmp-dev am: am: ... · 3a53e2ce

Narayan Kamath authored 8 years ago

resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 am: b5f75c45 am: af43cd03 -s ours am: c681771b am: de03f5ac am: 7d106d59
am: b8f35dd7

Change-Id: I9761ac7ba5f26a1e581fa1446e6e4b36753cf424

3a53e2ce

resolve merge conflicts of to lmp-dev am: am: ... · b8f35dd7

Narayan Kamath authored 8 years ago

resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 am: b5f75c45 am: af43cd03 -s ours am: c681771b am: de03f5ac
am: 7d106d59

Change-Id: I5657567402cdce858ab88c253ba2badaa062ceca

b8f35dd7

resolve merge conflicts of to lmp-dev am: am: ... · 7d106d59

Narayan Kamath authored 8 years ago

resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 am: b5f75c45 am: af43cd03  -s ours am: c681771b
am: de03f5ac

Change-Id: I88f747f334701d9e6daf4c18aa07051948fc0322

7d106d59

resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 am: b5f75c45 am: af43cd03 -s ours · de03f5ac
Narayan Kamath authored 8 years ago
```
am: c681771b

Change-Id: I0fb6263aa98124acb03e79b9c102c7ee6d3e94ba
```
de03f5ac
resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 am: b5f75c45 · c681771b
Narayan Kamath authored 8 years ago
```
am: af43cd03  -s ours

Change-Id: Ifd07ba06cecf61ba53af64bae08f0dac679c9e06
```
c681771b
resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 · af43cd03
Narayan Kamath authored 8 years ago
```
am: b5f75c45

Change-Id: Iacea86ad3c142d6f14b5fbdfb5b615f4705b1bd1
```
af43cd03
resolve merge conflicts of a47780b9 to lmp-dev · b5f75c45
Narayan Kamath authored 8 years ago
```
am: 61f27551

Change-Id: I418fb945e685e2983187c2ba43ad66ec99b468ec
```
b5f75c45
resolve merge conflicts of a47780b9 to lmp-dev · 61f27551
Narayan Kamath authored 8 years ago
```
Test: test_zipfile with known bad files.

Change-Id: I25dde73c9b94d253c8017e441e89cb7339907c7f
```
61f27551
libzipfile: add additional validity checks. am: a1ec2363 · a47780b9
Narayan Kamath authored 8 years ago
```
am: c307830f

Change-Id: I5d856cec4528541ff5416456cbe1338c78a09699
```
a47780b9
libzipfile: add additional validity checks. · c307830f
Narayan Kamath authored 8 years ago
```
am: a1ec2363

Change-Id: I290e611776bd58b47266a2cb9371a832bdc0744e
```
c307830f

20 Sep, 2016 3 commits

Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE · a1e35a5f
Dan Willemsen authored 8 years ago
```
am: 15366542

Change-Id: Idb1bea870de3251d7fa9682526e9634fe965424d
```
a1e35a5f

Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE · 15366542

Dan Willemsen authored 9 years ago

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

15366542

Revert "Restrict pmsg use to eng builds." · 1723f3fc

Mark Salyzyn authored 8 years ago

This reverts commit f894b96a.

Kernel binaries have incorporated the performance-enhanced pmsg driver
that has removed the bounce buffer.

Bug: 31057326
Bug: 30375418
Change-Id: Id6cec3ac144f57e8e5465aa48bbdc829cf29e283

1723f3fc

13 Sep, 2016 1 commit

libzipfile: add additional validity checks. · a1ec2363

Narayan Kamath authored 8 years ago

- 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

a1ec2363

08 Sep, 2016 9 commits
- liblog: add __android_log_close() am: b1b5d507 am: f72c9bc4 am: 49d5582f... · c11b9e1e
  Mark Salyzyn authored 8 years ago
```
liblog: add __android_log_close() am: b1b5d507 am: f72c9bc4 am: 49d5582f am: 1b1b6a48  -s ours am: 4eb04cb3
am: 38f72ac4

Change-Id: I0ad2d50b03195b3742f4404119f82b068d610cfe
```
  c11b9e1e
- liblog: add __android_log_close() am: b1b5d507 am: f72c9bc4 am: 49d5582f... · 38f72ac4
  Mark Salyzyn authored 8 years ago
```
liblog: add __android_log_close() am: b1b5d507 am: f72c9bc4 am: 49d5582f am: 1b1b6a48  -s ours
am: 4eb04cb3

Change-Id: Ia6da02026a7e8cb0374cdfccd4f2a98c78360cc1
```
  38f72ac4
- liblog: add __android_log_close() am: b1b5d507 am: f72c9bc4 am: 49d5582f · 4eb04cb3
  Mark Salyzyn authored 8 years ago
```
am: 1b1b6a48  -s ours

Change-Id: I21849cf64861536e911f94d95181822ffb06805c
```
  4eb04cb3
- liblog: add __android_log_close() am: b1b5d507 am: f72c9bc4 · 1b1b6a48
  Mark Salyzyn authored 8 years ago
```
am: 49d5582f

Change-Id: I11566801e6b467394b41dad598b697ceb43c9acf
```
  1b1b6a48
- liblog: add __android_log_close() am: b1b5d507 · 49d5582f
  Mark Salyzyn authored 8 years ago
```
am: f72c9bc4

Change-Id: I144b6ef420fadb6155f5a1b367c58d26ca1dfaac
```
  49d5582f
- liblog: add __android_log_close() · f72c9bc4
  Mark Salyzyn authored 8 years ago
```
am: b1b5d507

Change-Id: I5d6a6e97960e88e6f668b6376ec296d7452ec1dc
```
  f72c9bc4
- liblog: add __android_log_close() am: bd36696a · 99296d0e
  Mark Salyzyn authored 8 years ago
```
am: 56dffbcf

Change-Id: Ife62a0d684726467c6501f3d9f8fb5f287513093
```
  99296d0e
- liblog: add __android_log_close() · 56dffbcf
  Mark Salyzyn authored 8 years ago
```
am: bd36696a

Change-Id: I2668ee6168327f1a8283b0d2cf646e6ab9d1d219
```
  56dffbcf
- Merge "Added a NETWORK trace tag." into nyc-mr1-dev · d8ce1bf1
  TreeHugger Robot authored 8 years ago
  
  d8ce1bf1
07 Sep, 2016 14 commits

liblog: add __android_log_close() · bd36696a

Mark Salyzyn authored 8 years ago

Bug: 30963384

(cherry picked from commit df7a4c6b)

(cherry picked from commit c12d3d250ceb6a4380d2fcaf7f6d30bdea200dad)

Change-Id: Id4313e99bf86b41c3713e1c2db0242d12aeb8bb7

bd36696a

Added a NETWORK trace tag. · 785735bd
Felipe Leme authored 8 years ago
```
BUG: 31281543
Change-Id: I4d7c7fc26c77fec099bbf0f9426e3a9f3a722e6d
```
785735bd

Merge "liblog: add __android_log_close()" into lmp-dev am: am:... · e3b604de

Narayan Kamath authored 8 years ago

Merge "liblog: add __android_log_close()" into lmp-dev am: 04144120 am: 2f16f2b9 am: 0f6c4a0e am: ffb34de4 am: baa3f2bd am: 8013db9c am: a55e9f01 am: e5a1c7d8 am: ed4d8ac6
am: 309dde12

Change-Id: I20ad1256a5cfee50338755eccf3efe3fbbfab074

e3b604de

liblog: add __android_log_close() am: am: am: ... · 9a94f3b1

Mark Salyzyn authored 8 years ago

liblog: add __android_log_close() am: 2d149691 am: 3b2fa3ea am: 7b16dcf9 am: 94ebdd6b am: 5f04ac60 am: 4d12c20a am: e09c5d2c am: 68afb458 -s ours am: 3213ec22
am: c006a8c8

Change-Id: Ia712f681bdd10e4943fb86172e5dcd76f04aaada

9a94f3b1

Merge "liblog: add __android_log_close()" into lmp-dev am: am:... · 309dde12

Narayan Kamath authored 8 years ago

Merge "liblog: add __android_log_close()" into lmp-dev am: 04144120 am: 2f16f2b9 am: 0f6c4a0e am: ffb34de4 am: baa3f2bd am: 8013db9c am: a55e9f01 am: e5a1c7d8
am: ed4d8ac6

Change-Id: I522040759651064ca12b337f9bc0c10d946cdb30

309dde12

liblog: add __android_log_close() am: am: am: ... · c006a8c8

Mark Salyzyn authored 8 years ago

liblog: add __android_log_close() am: 2d149691 am: 3b2fa3ea am: 7b16dcf9 am: 94ebdd6b am: 5f04ac60 am: 4d12c20a am: e09c5d2c am: 68afb458 -s ours
am: 3213ec22

Change-Id: I743a0b3fad9d45b4546e1e9217e3999780b1595f

c006a8c8

Merge "liblog: add __android_log_close()" into lmp-dev am: am:... · ed4d8ac6

Narayan Kamath authored 8 years ago

Merge "liblog: add __android_log_close()" into lmp-dev am: 04144120 am: 2f16f2b9 am: 0f6c4a0e am: ffb34de4 am: baa3f2bd am: 8013db9c am: a55e9f01
am: e5a1c7d8

Change-Id: I9781dceedf14851071757cdc3c63c3be06bf2d1f

ed4d8ac6

liblog: add __android_log_close() am: am: am: ... · 3213ec22

Mark Salyzyn authored 8 years ago

liblog: add __android_log_close() am: 2d149691 am: 3b2fa3ea am: 7b16dcf9 am: 94ebdd6b am: 5f04ac60 am: 4d12c20a am: e09c5d2c
am: 68afb458 -s ours

Change-Id: I6b817000bb5ed02a4a81a5caf7b73f415519df68

3213ec22

liblog: add __android_log_close() · b1b5d507

Mark Salyzyn authored 8 years ago

Bug: 30963384

(cherry picked from commit df7a4c6b)

Change-Id: Ide70df3c04e29301649a1ca234b1b0af687bcbfb

b1b5d507

liblog: add __android_log_close() am: am: am: ... · 9f8d3d32

Mark Salyzyn authored 8 years ago

liblog: add __android_log_close() am: c68706fe am: edc5507f am: 85b0dd64 -s ours am: ef661e0a am: 1b6b3471 am: edbf5d59 am: 1b9ae6ea am: cfea0949 am: 87f09ae5 am: c1197f5b am: f3af4388 am: 356988f1
am: b8218ee8

Change-Id: I49d29172653f5e471d1b0bfbbbd68757de564a0e

9f8d3d32

Merge "liblog: add __android_log_close()" into lmp-dev am: am:... · e5a1c7d8

Narayan Kamath authored 8 years ago

Merge "liblog: add __android_log_close()" into lmp-dev am: 04144120 am: 2f16f2b9 am: 0f6c4a0e am: ffb34de4 am: baa3f2bd am: 8013db9c
am: a55e9f01

Change-Id: If64261d4be388b1879d5aea5d91dc77a7ec7a693

e5a1c7d8

liblog: add __android_log_close() am: am: am: ... · 68afb458

Mark Salyzyn authored 8 years ago

liblog: add __android_log_close() am: 2d149691 am: 3b2fa3ea am: 7b16dcf9 am: 94ebdd6b am: 5f04ac60 am: 4d12c20a
am: e09c5d2c

Change-Id: Id19b06af22568f6fa70e9d1b381a4d8ce5b595d0

68afb458

Merge "liblog: add __android_log_close()" into lmp-dev am: am:... · a55e9f01

Narayan Kamath authored 8 years ago

Merge "liblog: add __android_log_close()" into lmp-dev am: 04144120 am: 2f16f2b9 am: 0f6c4a0e am: ffb34de4 am: baa3f2bd
am: 8013db9c

Change-Id: If9798691ad5a4db7928b50c6c2ce39745c113f74

a55e9f01

liblog: add __android_log_close() am: am: am: ... · e09c5d2c

Mark Salyzyn authored 8 years ago

liblog: add __android_log_close() am: 2d149691 am: 3b2fa3ea am: 7b16dcf9 am: 94ebdd6b am: 5f04ac60
am: 4d12c20a

Change-Id: Ie41afcef1401543ed3f05dce2834a31487bdc892

e09c5d2c