Commit graph

33739 commits

Author SHA1 Message Date
Josh Gao
3df484eeab Merge "adb: increase the shell command length limit." am: 9d2e688b9a
am: 749d2a0ab5

Change-Id: Ib450863883d11cb256421e2c4f12c36d8af37570
2017-06-17 22:06:30 +00:00
Josh Gao
749d2a0ab5 Merge "adb: increase the shell command length limit."
am: 9d2e688b9a

Change-Id: Iefd9a87912141a24d0603fa4eb824b59195217c4
2017-06-17 22:02:29 +00:00
Treehugger Robot
9d2e688b9a Merge "adb: increase the shell command length limit." 2017-06-17 21:57:12 +00:00
Josh Gao
a019f78141 adb: increase the shell command length limit.
Relax the shell command length limits when talking to an adbd with the
shell protocol.

shell is pretty much the only service that takes an arbitrarily long
string, so this is somewhat safe.

Bug: http://b/37716055
Test: `adb shell $(python -c 'print "echo " + "f" * (32*1024)') | wc` on L and master
Change-Id: I0737fd2244530ef8080f300cd3a3549a1ab93465
2017-06-16 18:01:11 -07:00
Erik Staats
647d0aa62b Merge "Add building and installing of grep for vendor." am: 23bcbf040d
am: bb0a970036

Change-Id: Iae67462c6d6d17aea701d875d0838fd29c78a7f5
2017-06-16 23:33:36 +00:00
Erik Staats
bb0a970036 Merge "Add building and installing of grep for vendor."
am: 23bcbf040d

Change-Id: I2ed4502449f8c003a2caff37d642b5774f79f4cc
2017-06-16 23:31:06 +00:00
Treehugger Robot
23bcbf040d Merge "Add building and installing of grep for vendor." 2017-06-16 23:24:32 +00:00
Neil Fuller
46359d297a Merge "Track movement of some libcore/tzdata files" am: 6794bc7d37
am: e4950aba1a  -s ours

Change-Id: I6714ac946001813cc805491827c228697ced543a
2017-06-16 15:03:40 +00:00
Neil Fuller
e4950aba1a Merge "Track movement of some libcore/tzdata files"
am: 6794bc7d37

Change-Id: Iaadcef18ac75de0f6d31485d7c9fdd555bc0e6b0
2017-06-16 14:51:38 +00:00
Neil Fuller
6794bc7d37 Merge "Track movement of some libcore/tzdata files" 2017-06-16 14:37:18 +00:00
Neil Fuller
d38c848049 Track movement of some libcore/tzdata files
Some files in libcore/tzdata are moving to system/timezone
under the package com.android.timezone.distro.

Bug: 31008728
Test: run cts -m CtsHostTzDataTests
Merged-In: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Change-Id: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
2017-06-16 11:55:41 +00:00
Neil Fuller
13bc37d9d5 Track movement of some libcore/tzdata files
Some files in libcore/tzdata are moving to system/timezone
under the package com.android.timezone.distro.

Bug: 31008728
Test: run cts -m CtsHostTzDataTests
Change-Id: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
2017-06-16 12:38:06 +01:00
Colin Cross
16b3303b11 Merge "Add a helpful error message if GetUnreachableMemory fails" am: 72ca50359e
am: 947caff31b

Change-Id: Ib45a236a593f27a30a56dee192bcb945c9bbbbb7
2017-06-15 23:19:44 +00:00
Colin Cross
947caff31b Merge "Add a helpful error message if GetUnreachableMemory fails"
am: 72ca50359e

Change-Id: Icc656c40d90649e6060145ea7d3018b487369ecb
2017-06-15 23:16:14 +00:00
Colin Cross
72ca50359e Merge "Add a helpful error message if GetUnreachableMemory fails" 2017-06-15 23:10:16 +00:00
Erik Staats
0c3b1bd2a5 Add building and installing of grep for vendor.
Bug: 38240024
Test: Verified that grep is installed in /vendor/bin. See details in
testing done comment in https://android-review.googlesource.com/412061 .
Change-Id: I06007014779310bc24c65f7343111c5217ba6ff0
2017-06-15 15:04:41 -07:00
Elliott Hughes
a431e2961a Merge "Add libziparchive-based unzip." am: 3e67944d2e
am: 3cd4306ea2

Change-Id: I091fe18bb661a190b06ac6e884f285ebc9063dd6
2017-06-15 21:47:38 +00:00
Elliott Hughes
3cd4306ea2 Merge "Add libziparchive-based unzip."
am: 3e67944d2e

Change-Id: Ie45008d880157f7552b47664efecf087b390741b
2017-06-15 21:42:50 +00:00
Elliott Hughes
3e67944d2e Merge "Add libziparchive-based unzip." 2017-06-15 21:30:56 +00:00
Chih-Hung Hsieh
952005b1df Merge "Revert workaround of clang-tidy segmentation fault." am: 243ab9cc7e
am: b547153143

Change-Id: I59dea6f8aa2a6558594280efe07314070643642a
2017-06-15 19:08:30 +00:00
Chih-Hung Hsieh
b547153143 Merge "Revert workaround of clang-tidy segmentation fault."
am: 243ab9cc7e

Change-Id: I5019b04384e22b37e809e4c10215bac7f646070f
2017-06-15 19:04:25 +00:00
Treehugger Robot
243ab9cc7e Merge "Revert workaround of clang-tidy segmentation fault." 2017-06-15 18:57:51 +00:00
Colin Cross
72d3881412 Add a helpful error message if GetUnreachableMemory fails
The primary reason for GetUnreachableMemory failing is selinux
blocking system apps from ptracing themselves.  Add a helpful
error message suggesting setenforce 0.

Bug: 27945735
Test: dumpsys meminfo --unreachable com.android.systemui
Change-Id: Ibfa9507860be36dffd514f82027f7a2f8a72ac48
2017-06-15 10:57:37 -07:00
Tom Cherry
9f91d2692c Merge "init: move killing of process groups to libprocessgroup" am: fbbb3bd49a
am: 8040f8eb82

Change-Id: Ie63521a9114ca407c3c40aae3099cf3e94fdfac6
2017-06-15 17:27:55 +00:00
Tom Cherry
8040f8eb82 Merge "init: move killing of process groups to libprocessgroup"
am: fbbb3bd49a

Change-Id: I44ce77f50905b209d24dee592eef28325c2a409d
2017-06-15 17:23:48 +00:00
Tom Cherry
fbbb3bd49a Merge "init: move killing of process groups to libprocessgroup" 2017-06-15 17:17:22 +00:00
Chih-Hung Hsieh
47bd75701b Revert workaround of clang-tidy segmentation fault.
Problem was fixed in new rebased clang-tidy.
Bug: 38002385
Test: build with WITH_TIDY=1
Change-Id: Ic22d016fb2d402c3eee16226be507f5d4cfa2818
2017-06-15 10:05:04 -07:00
Narayan Kamath
08ffb1b94a Merge "zip_archive: validate data descriptor contents." am: b001cc5b1c
am: ec95719844

Change-Id: Ie1d5c733c478100b4e7b09be4ef4f59f9bb6d688
2017-06-15 11:00:52 +00:00
Narayan Kamath
ec95719844 Merge "zip_archive: validate data descriptor contents."
am: b001cc5b1c

Change-Id: I54d90a279bb908b9755a4f3100f474a80911a6ec
2017-06-15 10:57:23 +00:00
Narayan Kamath
b001cc5b1c Merge "zip_archive: validate data descriptor contents." 2017-06-15 10:52:33 +00:00
Elliott Hughes
723341d4b1 Merge "Remove <sys/mtio.h> workaround." am: 7bdbe0010c
am: c7624fd6d6

Change-Id: If69ad5b4bb1969d6517c4183024f72354ff0f9ff
2017-06-15 02:52:30 +00:00
Elliott Hughes
c7624fd6d6 Merge "Remove <sys/mtio.h> workaround."
am: 7bdbe0010c

Change-Id: I394fd6e97ed74f56e51216ba557e84b36ee64ac5
2017-06-15 02:49:28 +00:00
Treehugger Robot
7bdbe0010c Merge "Remove <sys/mtio.h> workaround." 2017-06-15 02:40:35 +00:00
Elliott Hughes
c286f47dd1 Remove <sys/mtio.h> workaround.
Bug: N/A
Test: builds
Change-Id: I4f2f615720639cb6ec4ac8a6b08c5907008f98ee
2017-06-14 17:17:16 -07:00
Mikhail Lappo
df36644d68 Merge "Va_end should be used with va_start" am: 5f4808382e
am: 34b7617cb7

Change-Id: Ibc9fed36270da3f960179086792ce1187be31e92
2017-06-14 23:11:05 +00:00
Mikhail Lappo
34b7617cb7 Merge "Va_end should be used with va_start"
am: 5f4808382e

Change-Id: Ie79756bdc9a34b4d5b90057a74a0f6bd0007b655
2017-06-14 23:08:04 +00:00
Treehugger Robot
5f4808382e Merge "Va_end should be used with va_start" 2017-06-14 23:00:42 +00:00
Adam Lesinski
234e7683d3 Merge "libziparchive: verify that gpb flags match" am: 04c4f40a82
am: 9244a6b573

Change-Id: I87481c3c37c7dc4049ce6317dd4dea46a55ae3ef
2017-06-14 15:32:15 +00:00
Adam Lesinski
9244a6b573 Merge "libziparchive: verify that gpb flags match"
am: 04c4f40a82

Change-Id: I767f07b922a89203bf69b5e41c0897f81135759e
2017-06-14 15:28:11 +00:00
Treehugger Robot
04c4f40a82 Merge "libziparchive: verify that gpb flags match" 2017-06-14 15:20:56 +00:00
Narayan Kamath
162b705801 zip_archive: validate data descriptor contents.
- Ensure that the compressed and uncompressed lengths in the data
  descriptor match those in the central directory.

- Calculate CRCs for compressed entries and ensure that those CRCs
  match the information in the central directory / data descriptor.
  This is currently guarded by a flag and will be turned on at a
  later stage.

- Finally, always trust the LFH when it comes to indicating the
  existence of a data descriptor. We no longer require this info to
  match the central directory to bring this in line with other zip
  processing tools. (see NOTE in the included change).

Bug: 62047801
Test: zip_archive_test
Change-Id: Icceea66a8b1937c08a4af9aee97bc77ad7218c0f
2017-06-14 14:29:53 +01:00
Adam Lesinski
1d105aa597 libziparchive: verify that gpb flags match
The Central File Header and Local File Header should
have the same general purpose bit flags set for
consistency.

Bug: 36686974
Test: existing tests pass (ziparchive-tests)

(cherry picked from commit 73b3aa541f)

Change-Id: Ia672a28732154a564ea2f2e3520238bb77924a56
2017-06-14 14:25:55 +01:00
Hung-ying Tyan
e908e98895 Merge changes from topic 'move-default-prop-v2' into oc-dev
am: c6b07ec095  -s ours

Change-Id: Icf6feeb41709606a8144b2e50aebe7a327e6e183
2017-06-14 02:29:29 +00:00
Hung-ying Tyan
c6b07ec095 Merge changes from topic 'move-default-prop-v2' into oc-dev
* changes:
  Load /prop.default in recovery mode
  Revert "Revert "Load default prop from /system/etc/prop.default""
2017-06-14 02:13:50 +00:00
Josh Gao
1366c5c120 Merge "Revert "crash_dump: defer pausing threads until we're ready."" am: 550f3bf328
am: b3ce850ba2

Change-Id: I5493ef885c9e820fd035c10d917851fdfa996bb2
2017-06-13 18:36:40 +00:00
Josh Gao
b3ce850ba2 Merge "Revert "crash_dump: defer pausing threads until we're ready.""
am: 550f3bf328

Change-Id: I0ab3cbe6b43fa650978558870124bc5288a43e8f
2017-06-13 18:33:09 +00:00
Josh Gao
550f3bf328 Merge "Revert "crash_dump: defer pausing threads until we're ready."" 2017-06-13 18:22:01 +00:00
Josh Gao
3407d7c80f Revert "crash_dump: defer pausing threads until we're ready."
This reverts commit 8a2a2d182a.

Bug: http://b/62572585
Change-Id: Ia4278bca52178eb7b7b28b30d0930b292d97f353
2017-06-13 17:21:12 +00:00
Hung-ying Tyan
75801ab5e3 Load /prop.default in recovery mode
Bug: 37815285
Bug: 62525809
Test: Tested with ag/2398663 and ag/2400523. Booted pixel phones,
      checked the location of prop.default, verified the symlink,
      checked a few properties via adb shell and manually tested
      a few apps.
      Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I034b700fcd60b0104873131e94864b16ef4bd9f6
2017-06-13 21:22:50 +08:00
Hung-ying Tyan
12ea2d12ef Revert "Revert "Load default prop from /system/etc/prop.default""
This reverts commit 98a73a2ce1.

Bug: 37815285
Bug: 62525809
Test: Tested with ag/2398663 and ag/2400524. Booted pixel phones,
      checked the location of pro.default, verified the symlink
      at /default.prop, checked a few properties via adb shell and
      manually tested a few apps.
      Booted to recovery mode and ran 'adb sideload' successfully.
Change-Id: I407412a7002b898ffb352cb5f331cab9c15be39a
2017-06-13 21:22:06 +08:00