Nick Vaccaro
1f1a6fdac8
healthd: allow override of wake interval timing
...
Devices can now override DEFAULT_PERIODIC_CHORES_INTERVAL_FAST
and DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW by defining a value for
BOARD_PERIODIC_CHORES_INTERVAL_FAST and/or BOARD_PERIODIC_CHORES_INTERVAL_SLOW
in the device's BoardConfig.mk file.
Bug: 32162033
Change-Id: I956fd4760893ae6c2eb3a3af586353d4d66daf25
2016-10-21 19:39:05 -07:00
Tim Murray
09136d8a74
Merge "healthd: move binder fd to not use EPOLLWAKEUP" into nyc-mr1-dev
...
am: a3bd97a019
Change-Id: Iec84824eed209ba0769cae03c9a1813eca9817bd
2016-10-21 21:49:51 +00:00
Tim Murray
098babc7c8
healthd: move binder fd to not use EPOLLWAKEUP
...
am: e89ea5eb85
Change-Id: I2e5a55d3bc381baa679e39e63d37164f76ffdcfc
2016-10-21 21:49:50 +00:00
Tim Murray
a3bd97a019
Merge "healthd: move binder fd to not use EPOLLWAKEUP" into nyc-mr1-dev
2016-10-21 21:41:29 +00:00
Tim Murray
e89ea5eb85
healthd: move binder fd to not use EPOLLWAKEUP
...
The binder fd doesn't need to use EPOLLWAKEUP and shouldn't; if it does,
it will prevent suspend unnecessarily.
bug 32180327
Change-Id: I292f1ada0c698290f6bd5518b237867ed69ec391
2016-10-21 09:11:49 -07:00
Tim Murray
1a3e744d18
Merge "Revert "libsuspend: move to exponential backoff"" into nyc-mr1-dev
...
am: bfec148834
Change-Id: If248d128e6e07915417f51a646a3d7dc11c20bca
2016-10-18 18:43:36 +00:00
Tim Murray
4dcd461945
Revert "libsuspend: move to exponential backoff"
...
am: 23c8bab024
Change-Id: I07decd5946c8877308b8ee9d2b49536fcabf548c
2016-10-18 18:40:48 +00:00
Tim Murray
bfec148834
Merge "Revert "libsuspend: move to exponential backoff"" into nyc-mr1-dev
2016-10-18 18:32:16 +00:00
Tim Murray
23c8bab024
Revert "libsuspend: move to exponential backoff"
...
This reverts commit fb896944b6
.
bug 32180327
Change-Id: Ic26bdffac6c56b102348f5393e6eb5d895960d7e
2016-10-18 17:05:59 +00:00
Lingfeng Yang
e476e9ce34
Fix adb flakiness on reboot
...
am: eec5e52ea2
Change-Id: I3496785fa4aecbab424d9f9c516415b3a3daecb2
2016-10-12 23:38:38 +00:00
Lingfeng Yang
eec5e52ea2
Fix adb flakiness on reboot
...
bug: 31950237
There are two lists of active ADB transports (devices),
and with the emulator, they can go out of sync.
This CL more conservatively checks if there are no
transports in either list before commiting to
register a new transport for the emulator.
Change-Id: Id1201dc59c70825881dad80925c2e5bcc13dbd5e
(cherry picked from commit edaedfd5da
)
2016-10-12 22:27:45 +00:00
Tim Murray
cf11830695
libsuspend: move to exponential backoff
...
am: fb896944b6
Change-Id: Ib94c5340ff89a6e2f3823a2eaa2be445e097cfa0
2016-10-12 18:13:18 +00:00
Tim Murray
fb896944b6
libsuspend: move to exponential backoff
...
If for some reason the system can't suspend (usually a driver bug),
libsuspend will currently attempt to retry suspend after 100ms. Because
entering suspend takes a significant amount of CPU time, this can be
extremely expensive and be a major contributor to rapid battery
drain. Move autosuspend to use exponential backoff if the previous
suspend attempt failed.
bug 32092914
Change-Id: I3e9e944f290de5f1853a02e3f61721ba9159df46
2016-10-11 14:51:34 -07:00
Glenn Kasten
524d444f66
Merge "Traverse /etc/init in a well-defined order" into nyc-mr1-dev
...
am: 5639d9ad6e
Change-Id: I7f22d6962b2b40abed3b44dcf15242144f2a4e24
2016-10-10 16:47:21 +00:00
Glenn Kasten
ac087d798b
Traverse /etc/init in a well-defined order
...
am: 89579f241c
Change-Id: I7d56236bb85e6c0a27f7c3f304eb8bd04576e3ef
2016-10-10 16:41:19 +00:00
Glenn Kasten
5639d9ad6e
Merge "Traverse /etc/init in a well-defined order" into nyc-mr1-dev
2016-10-10 16:13:36 +00:00
Glenn Kasten
89579f241c
Traverse /etc/init in a well-defined order
...
Bug: 31996208
Test: will need a CTS, not yet done
Change-Id: I5ecc7f0519d42a83065b7b97a31cdb5b33549cda
2016-10-09 10:16:20 -07:00
Tianjie Xu
c4b38b2b0c
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
am: 167562aa76
am: 398adf9b55
am: 680c3f1dc4
am: f0ce69815f
am: 6fb68bb196
am: 2af1a88fcb
...
am: ae8cebf5ae
Change-Id: I251374041170b92d52dd1aec5797763881f3118c
2016-10-07 00:37:32 +00:00
Tianjie Xu
ae8cebf5ae
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
am: 167562aa76
am: 398adf9b55
am: 680c3f1dc4
am: f0ce69815f
am: 6fb68bb196
...
am: 2af1a88fcb
Change-Id: I7a5fdc8df2449a332c7696c472e25880bfccc67f
2016-10-07 00:33:31 +00:00
Tianjie Xu
2af1a88fcb
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
am: 167562aa76
am: 398adf9b55
am: 680c3f1dc4
am: f0ce69815f
...
am: 6fb68bb196
Change-Id: I02579d25e7117053d6d20781ae75c64fdb76b88d
2016-10-07 00:30:01 +00:00
Tianjie Xu
6fb68bb196
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
am: 167562aa76
am: 398adf9b55
am: 680c3f1dc4
...
am: f0ce69815f
Change-Id: I8e69df083b6d5cd3a7e6bf7113ae836932c2e9f2
2016-10-07 00:26:31 +00:00
Tianjie Xu
f0ce69815f
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
am: 167562aa76
am: 398adf9b55
...
am: 680c3f1dc4
Change-Id: Ibd3e65922bb05b1247018d6dc89d3f79cf0eedd2
2016-10-07 00:23:01 +00:00
Tianjie Xu
680c3f1dc4
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
am: 167562aa76
...
am: 398adf9b55
Change-Id: If29777acccff5966a66e427e5baaeb536e161aaa
2016-10-07 00:19:30 +00:00
Tianjie Xu
398adf9b55
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
...
am: 167562aa76
Change-Id: Icb066cdaf63d87324c6eca8b5b45dbc23235aaa2
2016-10-07 00:15:00 +00:00
Tianjie Xu
167562aa76
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
...
am: 8788591224
Change-Id: I2f0ca98c74f23b1125f29b1eaf810143a83754b4
2016-10-07 00:11:29 +00:00
Tianjie Xu
8788591224
Fix out of bound access in libziparchive am: 1ee4892e66
...
am: c24dd97654
Change-Id: Ifddcfb7e658156c22539e07915115f4b657925b1
2016-10-07 00:07:59 +00:00
Tianjie Xu
c24dd97654
Fix out of bound access in libziparchive
...
am: 1ee4892e66
Change-Id: I26b48df5a9d39933b90ac063172b4b4ae8428bfd
2016-10-07 00:04:29 +00:00
Robb Glasser
2baa65a507
Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev
...
am: bba43b374b
Change-Id: I0a481621a85ff28894518b0c7357b19c1df6eec0
2016-09-26 21:23:57 +00:00
Thierry Strudel
5f4db94228
[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available
...
am: 738e0dcf0a
Change-Id: I9de236b53b4f4f449de65bfb856771278b92fa9e
2016-09-26 21:23:02 +00:00
Robb Glasser
bba43b374b
Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev
2016-09-26 21:15:24 +00:00
Tianjie Xu
1ee4892e66
Fix out of bound access in libziparchive
...
The boundary check of an invalid EOCD record may succeed due to the
overflow of uint32_t. Fix the check.
Test: Open the crash.apk and libziparchive reports the offset error as expected.
Bug: 31251826
Change-Id: I1d8092a19b73886a671bc9d291cfc27d65e3d236
(cherry picked from commit ae8180c06d
)
2016-09-22 18:24:53 -07:00
Narayan Kamath
cbd82ed9e7
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
...
am: 320a603b32
Change-Id: Ic10ed8262eec16649acbeff9e265a3ca9bfdba07
2016-09-21 18:02:22 +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
72b39acd97
Use BOARD_USES_VENDORIMAGE to detect vendor image presence - DO NOT MERGE am: 1536654205
...
am: a1e35a5fb4
Change-Id: I61a4e78b34b09957b409e0d449bb20f077393f74
2016-09-20 18:25:17 +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
Mark Salyzyn
acf9f6d71b
Revert "Restrict pmsg use to eng builds."
...
am: 1723f3fcd1
Change-Id: Idf6703adbdbae1cfc42e92a9951920d29b69d29a
2016-09-20 17:42:21 +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