Commit graph

42502 commits

Author SHA1 Message Date
Luis Hector Chavez
d9915714e8 Merge "init.rc: Remount / with MS_REMOUNT|MS_BIND|MS_NODEV" am: 19ef02ef42 am: 81c97bc46f
am: df271c4842

Change-Id: Ib60a55a8d8cca5d5a74d30b6b21c803cf8222688
2018-07-11 11:06:51 -07:00
Luis Hector Chavez
df271c4842 Merge "init.rc: Remount / with MS_REMOUNT|MS_BIND|MS_NODEV" am: 19ef02ef42
am: 81c97bc46f

Change-Id: Id461d5ce053ad7852797b85b71cb1c6f20b615b5
2018-07-11 10:58:53 -07:00
Luis Hector Chavez
81c97bc46f Merge "init.rc: Remount / with MS_REMOUNT|MS_BIND|MS_NODEV"
am: 19ef02ef42

Change-Id: I94c5641308b7b2760bdc4734158011d9cb7146aa
2018-07-11 10:49:41 -07:00
Treehugger Robot
19ef02ef42 Merge "init.rc: Remount / with MS_REMOUNT|MS_BIND|MS_NODEV" 2018-07-11 17:38:13 +00:00
Luis Hector Chavez
d07d0942c6 init.rc: Remount / with MS_REMOUNT|MS_BIND|MS_NODEV
/ should not have any character/block devices, so might as well pass in
the nodev flag.

Bug: 73255020
Test: aosp_sailfish still boots
Test: sailfish:/ # find / -xdev -a \( -type b -o -type c -o -type p -o -type s \)
      sailfish:/ #
Test: rootfs on / type rootfs (rw,seclabel)
      /dev/root on / type ext4 (ro,seclabel,nodevrelatime)

Change-Id: Ia73e04b53a47506892d9d3cb61b471b81bb72dc3
2018-07-11 08:36:00 -07:00
Ryan Prichard
cfddd90a5a Merge "adb: fix escape_arg for multiple quotes" am: bcfc8a2ab0 am: 6065c03a5f
am: 79f604728a

Change-Id: I64b988ceae5af1f36a9c1f6be47206e8b83bd550
2018-07-11 01:59:27 -07:00
Ryan Prichard
79f604728a Merge "adb: fix escape_arg for multiple quotes" am: bcfc8a2ab0
am: 6065c03a5f

Change-Id: Ia1111aafd1caf7b51ea80291fda004fcaef73283
2018-07-11 01:56:10 -07:00
Ryan Prichard
6065c03a5f Merge "adb: fix escape_arg for multiple quotes"
am: bcfc8a2ab0

Change-Id: I6f8ad50434a5891e4da943435b308ae8af7a6d6a
2018-07-11 01:53:02 -07:00
Treehugger Robot
bcfc8a2ab0 Merge "adb: fix escape_arg for multiple quotes" 2018-07-11 08:46:11 +00:00
Ryan Prichard
e4fded2c48 adb: fix escape_arg for multiple quotes
escape_arg reuses the same index for the source (s) and the destination
(result), so it breaks on strings containing more than one quote, e.g:

 * a'b'c    ==> 'a'\''b'c'
 * a'bcde'f ==> 'a'\''b'\'cde'f'

Also make the function more efficient by doing fewer string copies. This
code is based on the android::base::Split code.

Use EXPECT_EQ because the tests can keep going if one fails.

Bug: none
Test: adb_test --gtest_filter=adb_utils.escape_arg
Change-Id: I6ca6e905fa53cc61b9a87276cb7116a5df7e8017
2018-07-10 23:32:09 -07:00
Pawin Vongmasa
c6630081d0 Merge "Fix build breakage on non-linux" am: 348878391a am: 7a865669b6
am: a7ab5d0533

Change-Id: If6e167684562e5fb3cca2bae97c6c8c0869cd705
2018-07-10 19:59:19 -07:00
Eric Laurent
3e635bfd60 Merge "add event log range for audioserver" am: 6f5d464fb9 am: fa6255a81e
am: f63cc9aa33

Change-Id: I1d1a385e0a950212c989d17e8b7d980ab0e1ec26
2018-07-10 19:58:29 -07:00
Pawin Vongmasa
a7ab5d0533 Merge "Fix build breakage on non-linux" am: 348878391a
am: 7a865669b6

Change-Id: Ia58d4c071739b3728599d915bcc001f7be1f4194
2018-07-10 19:38:59 -07:00
Eric Laurent
f63cc9aa33 Merge "add event log range for audioserver" am: 6f5d464fb9
am: fa6255a81e

Change-Id: I66a64ed126c4c95beb53c6f9ef63061e35a7b7d2
2018-07-10 19:38:09 -07:00
Pawin Vongmasa
7a865669b6 Merge "Fix build breakage on non-linux"
am: 348878391a

Change-Id: I2de8147849bb26aba91976046affd53201dc8f1f
2018-07-10 18:59:32 -07:00
Eric Laurent
fa6255a81e Merge "add event log range for audioserver"
am: 6f5d464fb9

Change-Id: I0bbeb315c87f22770477f557e6f7d2541ef0039f
2018-07-10 18:58:42 -07:00
Treehugger Robot
348878391a Merge "Fix build breakage on non-linux" 2018-07-11 01:43:24 +00:00
Treehugger Robot
6f5d464fb9 Merge "add event log range for audioserver" 2018-07-11 00:48:59 +00:00
Pawin Vongmasa
2b67f0b85b Fix build breakage on non-linux
Bug: 79173901

Test: liblp_test gtest
Change-Id: I846e99f636ed05f97e44d05a617dc17b5f127d2e
2018-07-10 16:46:44 -07:00
Eric Laurent
ab2ced57f1 add event log range for audioserver
Test: make.
Change-Id: I32a198b075a4c07f000ae311188ea61f71a69dab
2018-07-10 14:21:38 -07:00
Yabin Cui
712d586f84 Merge "Add debug system properties to control profiling limits." am: 1db3789252 am: 329e12fb57
am: c4df73c1cb

Change-Id: I4b731d3e0abcd692876d20ebe788d5fc14681bd3
2018-07-10 11:18:36 -07:00
Yabin Cui
c4df73c1cb Merge "Add debug system properties to control profiling limits." am: 1db3789252
am: 329e12fb57

Change-Id: I7e67c4831e6d28f8cba71999a680b38fbfeaa741
2018-07-10 11:14:15 -07:00
Yabin Cui
329e12fb57 Merge "Add debug system properties to control profiling limits."
am: 1db3789252

Change-Id: I32d3d93bc97aab5a9c21be0f0af5191b581aa32a
2018-07-10 11:11:09 -07:00
Yabin Cui
1db3789252 Merge "Add debug system properties to control profiling limits." 2018-07-10 18:03:54 +00:00
David Anderson
ce66defce2 Merge "liblp: Implement support for request queue alignment." am: 6a288d8128 am: a1e2f225b2
am: ebc0ce50cd

Change-Id: Id446b8679f4b5ebe08ad7bddbc2a1a1d08735765
2018-07-10 10:10:40 -07:00
David Anderson
ebc0ce50cd Merge "liblp: Implement support for request queue alignment." am: 6a288d8128
am: a1e2f225b2

Change-Id: I13db7c4c3c1e0140551879a7c5b9070c37e4ff24
2018-07-10 09:50:21 -07:00
David Anderson
a1e2f225b2 Merge "liblp: Implement support for request queue alignment."
am: 6a288d8128

Change-Id: Ide9cd597c9682b0b835510894c7224a90bbfe82c
2018-07-10 09:25:01 -07:00
Treehugger Robot
6a288d8128 Merge "liblp: Implement support for request queue alignment." 2018-07-10 15:48:17 +00:00
David Anderson
2332afb31f liblp: Implement support for request queue alignment.
Block devices in the Linux kernel have a "minimum I/O request" size. The
minimum size is usually acquired by the block driver and can change
from device to device. When stacking devices (such as with
device-mapper), the kernel goes through great lengths to make sure this
alignment is respected for optimal I/O. In device-mapper's case,
misalignment can lead to kernel warnings and performance issues.

While this is unlikely to matter with a few targets, it could become
problematic on a large number of targets, and so we would prefer to
align all partition extents to the minimum I/O size.

We now support two new properties in the partition table geometry: an
"alignment", which is the minimum I/O size, and an "alignment offset",
which is an offset that when applied to sector 0, causes the sector to
be properly aligned within its parent device (for example, if a
physical partition is misaligned). All partition extents now begin on a
sector that respects this alignment.

One major caveat is that it is difficult for the initial partition table
to have the correct alignment without build system and/or flash tool
support. To accomodate this, all alignment is optional, and the lpmake
tool will support a default alignment of 1MiB as a failsafe.

Bug: 79173901
Test: liblp_test gtest
Change-Id: I5bc41b90aa085f4f30393951af0d2b37c4ac2a72
2018-07-09 18:50:28 -07:00
Josh Gao
5a6734397c Merge "adbd: fix spurious failure to create dirs when pushing." am: de1d06ef0c am: 3193f97ffd
am: 50c38732e3

Change-Id: I0f36e66e6451708e1f75b28621af6b708d2e980c
2018-07-09 17:47:49 -07:00
Josh Gao
50c38732e3 Merge "adbd: fix spurious failure to create dirs when pushing." am: de1d06ef0c
am: 3193f97ffd

Change-Id: I023defb815332c753fb5f39f2967d7aab20860b8
2018-07-09 17:20:00 -07:00
Josh Gao
3193f97ffd Merge "adbd: fix spurious failure to create dirs when pushing."
am: de1d06ef0c

Change-Id: I145bc0e1cd4a2df8e4a9d3a3cc3c54c32ceb21d0
2018-07-09 17:05:43 -07:00
Treehugger Robot
de1d06ef0c Merge "adbd: fix spurious failure to create dirs when pushing." 2018-07-09 23:47:41 +00:00
Yabin Cui
4f0da7cb82 Add debug system properties to control profiling limits.
When security.perf_harden is disabled through adb, use some debug
system properties to set profiling limits in the kernel, including
cpu percentage, memory, and max sample rate.

Bug: 110706031
Test: boot hikey960 and manually set system properties to make
Test: sure it works.

Change-Id: I44c0adf3a000bb393905233f2a097c97b5fe91ec
2018-07-09 16:03:30 -07:00
Josh Gao
4c0078d67a adbd: fix spurious failure to create dirs when pushing.
When pushing to a path, we first try to ensure the directory path
exists and has the permissions expected by fs_config. Due to a change
that changed the fs_config check from a blacklist to a whitelist, we
started doing this for /data (which doesn't begin with /data/), and the
UID/GID for that path was accidentally being reused for following path
segments that didn't exist, leading to a failed attempt to chown
/data/local/tmp/foo to be owned by system.

Bug: http://b/110953234
Test: python test_device.py
Change-Id: Ie798eec48bcf54aea40f6d90cc03bb2170280ee8
2018-07-09 14:25:51 -07:00
Christopher Ferris
6e588cb6c0 Merge "Add support for new defines in v4.17.3 headers." am: 4251739928 am: 9ef07987dd
am: 6878a672a9

Change-Id: I4683de5bd2e247abe9e59e494d5be9c936a3d33b
2018-07-09 12:43:12 -07:00
Christopher Ferris
6878a672a9 Merge "Add support for new defines in v4.17.3 headers." am: 4251739928
am: 9ef07987dd

Change-Id: I99946a8f5fb71167db00eb2244dce40e45df8f1c
2018-07-09 12:37:50 -07:00
Christopher Ferris
9ef07987dd Merge "Add support for new defines in v4.17.3 headers."
am: 4251739928

Change-Id: Ia1a34502fac438a663ea680c7506fbdc88090106
2018-07-09 12:33:30 -07:00
Christopher Ferris
4251739928 Merge "Add support for new defines in v4.17.3 headers." 2018-07-09 19:23:00 +00:00
David Anderson
45e9a336cb Merge "liblp: Fix incorrect get_block_device_size usage." am: a04058ea48 am: 3e2ff2d2ed
am: 802000e559

Change-Id: I440312dd9f2b89b8d40e2e336cfa1294edf318d5
2018-07-09 10:33:57 -07:00
David Anderson
802000e559 Merge "liblp: Fix incorrect get_block_device_size usage." am: a04058ea48
am: 3e2ff2d2ed

Change-Id: Iae3a981de2bc61d0045f607a00b361246b8aafa2
2018-07-09 10:28:43 -07:00
David Anderson
3e2ff2d2ed Merge "liblp: Fix incorrect get_block_device_size usage."
am: a04058ea48

Change-Id: I17bca8e10f4d5039b8aaa632989fcb46763e13c6
2018-07-09 10:24:04 -07:00
Treehugger Robot
a04058ea48 Merge "liblp: Fix incorrect get_block_device_size usage." 2018-07-09 17:14:14 +00:00
David Anderson
839a818221 liblp: Fix incorrect get_block_device_size usage.
Bug: 79173901
Test: N/A
Change-Id: I22a3e86153830782453a47e460800f3cb4c26958
2018-07-06 16:01:27 -07:00
Bowgo Tsai
0f96be7b94 Merge "Add /mnt/product rw mount point for product partitions." am: 35f2704226 am: 7c4bb66d83
am: 72f539f061

Change-Id: Id16bda4f227df3b73226fead03360df54422b2a6
2018-07-02 19:10:44 -07:00
Bowgo Tsai
72f539f061 Merge "Add /mnt/product rw mount point for product partitions." am: 35f2704226
am: 7c4bb66d83

Change-Id: Icab47e0d7e5236ec7d75a38c54b92fb567eb26d8
2018-07-02 19:07:25 -07:00
Bowgo Tsai
7c4bb66d83 Merge "Add /mnt/product rw mount point for product partitions."
am: 35f2704226

Change-Id: I631decdbb3549d72478279da83ec4a5f99023b24
2018-07-02 19:03:38 -07:00
Treehugger Robot
35f2704226 Merge "Add /mnt/product rw mount point for product partitions." 2018-07-03 00:21:01 +00:00
Mark Salyzyn
0d33ca3a39 Merge "bootstat: record reboot reason history in persist.sys.boot.reason.history" am: 70025585ff am: 0e78b13226
am: 425e146be7

Change-Id: I0cf65c0294fdde8aeb7897b384ed58086c650b82
2018-07-02 13:41:42 -07:00
Mark Salyzyn
425e146be7 Merge "bootstat: record reboot reason history in persist.sys.boot.reason.history" am: 70025585ff
am: 0e78b13226

Change-Id: Iedf471802b434d8eb9597966b21191aa7a6572b9
2018-07-02 13:37:35 -07:00