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
2016-10-18 17:05:59 +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
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
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
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
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
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
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
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
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
2016-10-07 00:15:00 +00:00
Tianjie Xu
167562aa76
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654
...
am: 8788591224
2016-10-07 00:11:29 +00:00
Tianjie Xu
8788591224
Fix out of bound access in libziparchive am: 1ee4892e66
...
am: c24dd97654
2016-10-07 00:07:59 +00:00
Tianjie Xu
c24dd97654
Fix out of bound access in libziparchive
...
am: 1ee4892e66
2016-10-07 00:04:29 +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
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
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
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
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
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
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
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
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
2016-09-21 17:41:24 +00:00
Narayan Kamath
af43cd033c
resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7
...
am: b5f75c4582
2016-09-21 17:35:52 +00:00
Narayan Kamath
b5f75c4582
resolve merge conflicts of a47780b to lmp-dev
...
am: 61f27551c7
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
2016-09-21 08:26:10 +00:00
Narayan Kamath
c307830f5d
libzipfile: add additional validity checks.
...
am: a1ec23634a
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
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
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
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
2016-09-08 09:15:12 +00:00
Mark Salyzyn
4eb04cb32b
liblog: add __android_log_close() am: b1b5d507cb am: f72c9bc42d am: 49d5582f29
...
am: 1b1b6a4889
2016-09-08 09:05:14 +00:00
Mark Salyzyn
1b1b6a4889
liblog: add __android_log_close() am: b1b5d507cb am: f72c9bc42d
...
am: 49d5582f29
2016-09-08 08:44:07 +00:00
Mark Salyzyn
49d5582f29
liblog: add __android_log_close() am: b1b5d507cb
...
am: f72c9bc42d
2016-09-08 08:40:25 +00:00
Mark Salyzyn
f72c9bc42d
liblog: add __android_log_close()
...
am: b1b5d507cb
2016-09-08 08:30:54 +00:00
Mark Salyzyn
99296d0ef6
liblog: add __android_log_close() am: bd36696a16
...
am: 56dffbcffa
2016-09-08 07:43:50 +00:00
Mark Salyzyn
56dffbcffa
liblog: add __android_log_close()
...
am: bd36696a16
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
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
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
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
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
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
2016-09-07 19:22:11 +00:00
