Keun-young Park
ab54410f0d
Merge "Do not umount /vendor, /system, and /oem even if they are R/W." am: 11649e8925
am: c9f601a178
...
am: 10b74ed2a6
Change-Id: Ie0339f41eb166e156ab61133e6a2c19e4bbd28a2
2017-07-18 03:18:07 +00:00
Keun-young Park
10b74ed2a6
Merge "Do not umount /vendor, /system, and /oem even if they are R/W." am: 11649e8925
...
am: c9f601a178
Change-Id: Ia5f3096e339ed8d088482c5c11ed5e5b906e9205
2017-07-18 03:15:36 +00:00
Keun-young Park
c9f601a178
Merge "Do not umount /vendor, /system, and /oem even if they are R/W."
...
am: 11649e8925
Change-Id: I1b4db022ca316648dfccfa12c3f8e886e6b15b08
2017-07-18 03:12:37 +00:00
TreeHugger Robot
35b5e264d5
Merge "Add sys/cdefs.h to log/log_main.h."
2017-07-18 03:10:40 +00:00
Treehugger Robot
11649e8925
Merge "Do not umount /vendor, /system, and /oem even if they are R/W."
2017-07-18 03:08:42 +00:00
Bowgo Tsai
5284e433d0
Merge "adbd: lessen security constraints when the device is unlocked" am: e03665142e
am: 0fe0ced23c
am: 620f6e65b3
...
am: 9679967dac
Change-Id: Ife980c83b5424d7549eac2cebc047f1628507a14
2017-07-18 02:48:04 +00:00
Bowgo Tsai
9679967dac
Merge "adbd: lessen security constraints when the device is unlocked" am: e03665142e
am: 0fe0ced23c
...
am: 620f6e65b3
Change-Id: I532c68a077019cbf133db5cbdcf967509415687b
2017-07-18 02:45:06 +00:00
Bowgo Tsai
620f6e65b3
Merge "adbd: lessen security constraints when the device is unlocked" am: e03665142e
...
am: 0fe0ced23c
Change-Id: I5998cf88d64184df463d5b363efd6af618c19674
2017-07-18 02:42:03 +00:00
Bowgo Tsai
0fe0ced23c
Merge "adbd: lessen security constraints when the device is unlocked"
...
am: e03665142e
Change-Id: Iae19ade154c0d584268a8b035ea0ed90ceb537b4
2017-07-18 02:39:35 +00:00
Treehugger Robot
e03665142e
Merge "adbd: lessen security constraints when the device is unlocked"
2017-07-18 02:36:12 +00:00
Yifan Hong
79b1a3027b
Add sys/cdefs.h to log/log_main.h.
...
for liblog.vendor. __ANDROID_API__ is __ANDROID_API_FUTURE__
with BOARD_VNDK_VERSION=current, so we need it defined.
Bug: 33241851
Test: BOARD_VNDK_VERSION=current m libgui.vendor
(that uses liblog.vendor)
Change-Id: I340ec048094c027828f516d891250651e0c88eea
2017-07-17 17:59:35 -07:00
TreeHugger Robot
897ef5298d
Merge "storaged: record userdata space utilization"
2017-07-18 00:46:02 +00:00
Bowgo Tsai
f1d3dbc32f
adbd: lessen security constraints when the device is unlocked
...
ALLOW_ADBD_ROOT ('adb root') and ALLOW_ADBD_NO_AUTH (ro.adb.secure = 0)
are false in user build. This prevents a non-A/B device from running
Treble VTS because it requires 'adb root'. Without ALLOW_ADBD_NO_AUTH,
adb still can work if ro.adb.secure = 1. However, allowing it to be 0
is better for test automation.
The image combination in VTS is:
- system.img (userdebug): provided by Googlg
- boot.img (user): provided by the OEM <-- adbd is here
- vendor.img (user): provided by the OEM
This change allows 'adb root' and 'ro.adb.secure = 0' when the device is
unlocked in user build. No changes for userdebug/eng builds.
Note that the device must be unlocked when running VTS. Otherwise,
verified boot will prevent it from booting the system.img provided by
Google (no verity metadata).
Bug: 63313955
Bug: 63381692
Test: use the above image combination, check 'adb root' and
'ro.adb.secure = 0' can work
Change-Id: I109d96c950e54c4fb0ac0c98b989a20593681e52
2017-07-18 08:41:19 +08:00
Steven Moreland
7473bc7b4d
Merge "Revert "Mark libmetricslogger vendor_available."" am: 420eabe3b3
am: bd9bec463f
am: 4dae73a2c6
...
am: 2af4e88e70
Change-Id: I86ff62c1d850a4ce248028d85501b81e615d2bb5
2017-07-18 00:37:22 +00:00
Steven Moreland
2af4e88e70
Merge "Revert "Mark libmetricslogger vendor_available."" am: 420eabe3b3
am: bd9bec463f
...
am: 4dae73a2c6
Change-Id: Iebdce7328e3562554a676153d9e805f81031ecc5
2017-07-18 00:32:55 +00:00
Keun-young Park
6e12b3887e
Do not umount /vendor, /system, and /oem even if they are R/W.
...
- /vendor, /system, /oem can be remounted to R/W for development
purpose.
- In such case, umounting these partitions can lead into some processes
not running properly during shutdown or blocking umount of fs.
- So skip them. As it is dev feature, it is up to each developer to
understand the risk. But for normal adb sync - reboot should be ok
as shutdown involves sync operations.
bug: 37737296
Test: adb remount,reboot, and check last kmsg
Change-Id: Iab6a6374bc558375d359b3b49b14db93d363b1ad
2017-07-17 17:32:26 -07:00
Steven Moreland
4dae73a2c6
Merge "Revert "Mark libmetricslogger vendor_available."" am: 420eabe3b3
...
am: bd9bec463f
Change-Id: Ica0793d4040393cbf9337f29b5cadb8d7af4ac91
2017-07-18 00:28:23 +00:00
Steven Moreland
bd9bec463f
Merge "Revert "Mark libmetricslogger vendor_available.""
...
am: 420eabe3b3
Change-Id: I63d3abb5a5e3b0adc33992ae35567ead6278c919
2017-07-18 00:23:53 +00:00
Treehugger Robot
420eabe3b3
Merge "Revert "Mark libmetricslogger vendor_available.""
2017-07-18 00:14:41 +00:00
Jin Qian
8847c62579
storaged: record userdata space utilization
...
Update disk space utilization together with diskstats since we will
use free space size to co-relate disk performance.
Bug: 63629306
Change-Id: I4e5694aaff3b71aa56db451f1bc92ccfb07e5086
2017-07-17 15:51:30 -07:00
Tom Cherry
bbd8b8b534
Merge "ueventd: add tests for setegid()/setfscreatecon() and threads" am: 0ba56096d5
am: 730a5ddf27
am: 92b34b76b5
...
am: 643307dbd0
Change-Id: Ibd08ed409511c9f32b41981a7a653459dd50f72c
2017-07-17 20:04:37 +00:00
Tom Cherry
643307dbd0
Merge "ueventd: add tests for setegid()/setfscreatecon() and threads" am: 0ba56096d5
am: 730a5ddf27
...
am: 92b34b76b5
Change-Id: I07b8b06af95c0c0bf8889dce0f256bb901264bcc
2017-07-17 20:01:06 +00:00
Tom Cherry
92b34b76b5
Merge "ueventd: add tests for setegid()/setfscreatecon() and threads" am: 0ba56096d5
...
am: 730a5ddf27
Change-Id: I8da0974f3a8a42e2bdfb4f97af9ddc44b7483beb
2017-07-17 19:58:37 +00:00
Tom Cherry
730a5ddf27
Merge "ueventd: add tests for setegid()/setfscreatecon() and threads"
...
am: 0ba56096d5
Change-Id: Ib1619e4c52402710de09e971a1e96fd7caf0f75a
2017-07-17 19:56:06 +00:00
Treehugger Robot
0ba56096d5
Merge "ueventd: add tests for setegid()/setfscreatecon() and threads"
2017-07-17 19:51:58 +00:00
Tom Cherry
1baf95a9f9
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master am: 6665fd5991
am: fb61b61986
...
am: caf26d56c6
Change-Id: I0cf66d409e7837eee65e275a3709a92438ef1806
2017-07-17 19:36:46 +00:00
Steven Moreland
0430efbc05
Revert "Mark libmetricslogger vendor_available."
...
This reverts commit 7f96d49370
.
Reason for revert: depends on private liblog APIs
- log/log_event_list.h is not in the vndk
Change-Id: I448c2f1059bd6b225d8efff87eb3948e931de47a
2017-07-17 19:33:17 +00:00
Tom Cherry
caf26d56c6
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master am: 6665fd5991
...
am: fb61b61986
Change-Id: Ie7e2e43fca512d3306c1870e8090c71afb1dc4ce
2017-07-17 19:30:16 +00:00
Tom Cherry
fb61b61986
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
...
am: 6665fd5991
Change-Id: I53083a698a510ac07faa55eb35979514217b3292
2017-07-17 19:26:12 +00:00
Tom Cherry
6665fd5991
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
2017-07-17 19:20:52 +00:00
Luca Stefani
fd8d9906e3
Merge "logcat: Add missing newline to read failure" am: d1c73b57b5
am: 1c9f387b9a
am: 463af85726
...
am: fc218f891d
Change-Id: I082683238edd2745d52ab24cccf552f37dc36688
2017-07-17 18:48:02 +00:00
Luca Stefani
fc218f891d
Merge "logcat: Add missing newline to read failure" am: d1c73b57b5
am: 1c9f387b9a
...
am: 463af85726
Change-Id: I6f29d68538d0e3197eed00a896ccc3270c062a4f
2017-07-17 18:45:32 +00:00
Luca Stefani
463af85726
Merge "logcat: Add missing newline to read failure" am: d1c73b57b5
...
am: 1c9f387b9a
Change-Id: I57b630e56b8d2ce9c53cb2b7a3e8d88965d19bfa
2017-07-17 18:43:01 +00:00
Luca Stefani
1c9f387b9a
Merge "logcat: Add missing newline to read failure"
...
am: d1c73b57b5
Change-Id: I899e173ce3018435507a6fa1f6e9ca4782eec342
2017-07-17 18:40:33 +00:00
Treehugger Robot
d1c73b57b5
Merge "logcat: Add missing newline to read failure"
2017-07-17 18:27:45 +00:00
Tom Cherry
c2e181cf1d
ueventd: add tests for setegid()/setfscreatecon() and threads
...
setegid() and setfscreatecon() on Android both operate on a per-thread
basis, not a per-process basis.
Ueventd may take advantage of this in the future, so this CL
introduces tests that ensure that this functionality remains
consistent.
Bug: 63441941
Test: newly added unit tests
Change-Id: I8b1c62cc322b6fe44b748550a4cea8658d9efd88
2017-07-17 11:08:41 -07:00
Mark Salyzyn
a2c055aba8
rootdir: record last build signature and kernel version am: 3ec9aa4a91
...
am: 6ce2044d26
Change-Id: I9aff38619a3f8b8476f8e9178adf22b0899035dd
2017-07-16 19:19:01 +00:00
Mark Salyzyn
6ce2044d26
rootdir: record last build signature and kernel version
...
am: 3ec9aa4a91
Change-Id: I91123a4d170193a5a533d62df86f1dd75442a5ab
2017-07-16 19:14:01 +00:00
Christopher Ferris
0fd030f319
Merge "Make the library usable as a library." am: ca94f65ea0
am: b38e142021
am: 6e56344834
...
am: 9b736cbbee
Change-Id: Ie0cf285dc87c4e300d414b0a4101dce6e1cc4886
2017-07-15 17:08:36 +00:00
Christopher Ferris
9b736cbbee
Merge "Make the library usable as a library." am: ca94f65ea0
am: b38e142021
...
am: 6e56344834
Change-Id: I512956e15a812f42714370e085b4c4b1efdf806c
2017-07-15 17:04:06 +00:00
Christopher Ferris
6e56344834
Merge "Make the library usable as a library." am: ca94f65ea0
...
am: b38e142021
Change-Id: Iade7d011b49e4fb2c323ef17b8c9e89525befa22
2017-07-15 16:59:04 +00:00
Christopher Ferris
b38e142021
Merge "Make the library usable as a library."
...
am: ca94f65ea0
Change-Id: Ic1986a1399a61b9ba3455d7ff4d2365cded86194
2017-07-15 16:54:36 +00:00
Christopher Ferris
ca94f65ea0
Merge "Make the library usable as a library."
2017-07-15 16:49:27 +00:00
Tom Cherry
a222129aff
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2
am: 5a6226929e
am: d165de95da
...
am: e1442a5df0
Change-Id: I470057eb4ccc0536eed869114cb999daf36469dc
2017-07-14 23:22:26 +00:00
Tom Cherry
e1442a5df0
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2
am: 5a6226929e
...
am: d165de95da
Change-Id: I11ebc6c79bcd5cf6b8fd619b1a71582b7c788d41
2017-07-14 23:18:02 +00:00
Tom Cherry
d165de95da
Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2
...
am: 5a6226929e
Change-Id: I648c45ea99d2b8695c337bbda7b0a6e45598e67e
2017-07-14 23:14:06 +00:00
Tom Cherry
5a6226929e
Merge changes from topic 'ext4_encryption_flag'
...
am: 5be05733c2
Change-Id: I242f679bb96f9ae71b624db4cbcb54dda5be5ee4
2017-07-14 23:11:43 +00:00
Tom Cherry
5be05733c2
Merge changes from topic 'ext4_encryption_flag'
...
* changes:
fs_mgr: set ext4 encryption flag with tune2fs when needed
fs_mgr: refactor pre-mount logic into prepare_fs_for_mount()
2017-07-14 23:06:30 +00:00
Mark Salyzyn
3ec9aa4a91
rootdir: record last build signature and kernel version
...
(cherry pick from commit 93394034a2
)
Rotate /default.prop and /proc/version into /data/misc/recovery/
as an aid in determining the vintage of the LAST_LOGCAT and
LAST_DMESG in the bugreport collection.
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Test: manually confirm content rotation through reboots
Bug: 62793047
Change-Id: Ibbe546c76041f20e308e58e5548939afac75db97
2017-07-14 14:49:50 -07:00
Mark Salyzyn
d16eebd96d
Merge "rootdir: record last build signature and kernel version" am: 91a17a41f6
am: 97e90c6bb8
am: a62497c189
...
am: 77bf7449b2
Change-Id: Ic2d43115a4423e3870870406fdf992f7449565bd
2017-07-14 21:33:42 +00:00