Commit graph

32992 commits

Author SHA1 Message Date
Tom Cherry
c2ef2f0d8d init: remove restorecon() from util.cpp
restorecon() has become nothing more than a small wrapper around
selinux_android_restore().  This itself isn't super problematic, but
it is an obstacle for compiling util.cpp on the host as that function
is not available on the host.

Bug: 36970783
Test: Boot bullhead
Change-Id: I7e209ece6898f9a0d5eb9e5d5d8155c2f1ba9faf
2017-05-08 16:41:13 -07:00
Mark Salyzyn
1a830d5daa Merge "init: add "+passcred" for socket to set SO_PASSCRED" am: 9811cd33ac am: 00d97b2327
am: a650c328f1

Change-Id: Id14c1e3c3aa3fdbf6e927d08720d2524d2e9b800
2017-05-08 23:27:27 +00:00
Mark Salyzyn
a650c328f1 Merge "init: add "+passcred" for socket to set SO_PASSCRED" am: 9811cd33ac
am: 00d97b2327

Change-Id: Ifcf163361dac257634e7dea60950792dbb054f2e
2017-05-08 23:25:56 +00:00
Mark Salyzyn
00d97b2327 Merge "init: add "+passcred" for socket to set SO_PASSCRED"
am: 9811cd33ac

Change-Id: I9b7c6e54ff7ea3b996fc62aa2d3d3c489fb8b9e3
2017-05-08 23:23:59 +00:00
Mark Salyzyn
9811cd33ac Merge "init: add "+passcred" for socket to set SO_PASSCRED" 2017-05-08 23:19:33 +00:00
Josh Gao
59edd00124 Merge "adb: properly handle libusb_clear_halt failure." am: 761ae04777 am: b44385f6b3
am: 9886b1aa4a

Change-Id: I5ea3f6ec34392f9a18bc2288b870325b340da98e
2017-05-08 22:54:24 +00:00
Josh Gao
9886b1aa4a Merge "adb: properly handle libusb_clear_halt failure." am: 761ae04777
am: b44385f6b3

Change-Id: Iab2804f11c8052eeb4bf4f6aaa04ea7d35dcc0e0
2017-05-08 22:52:26 +00:00
Josh Gao
b44385f6b3 Merge "adb: properly handle libusb_clear_halt failure."
am: 761ae04777

Change-Id: Ie45ec4c1786d851aa8c50de44d80bda13a27c099
2017-05-08 22:50:55 +00:00
Treehugger Robot
761ae04777 Merge "adb: properly handle libusb_clear_halt failure." 2017-05-08 22:44:34 +00:00
Mark Salyzyn
b066fccc5c init: add "+passcred" for socket to set SO_PASSCRED
In the init scripts for socket, the type can have a suffix of
"+passcred" to request that the socket be bound to report SO_PASSCRED
credentials as part of socket transactions.

Test: gTest logd-unit-tests --gtest_filter=logd.statistics right after boot
      (fails without logd.rc change)
Bug: 37985222
Change-Id: Ie5b50e99fb92fa9bec9a32463a0e6df26a968bfd
2017-05-08 14:04:13 -07:00
Tom Cherry
2920471ffa Merge "Revert "Make /data/data a symlink to /data/user/0"" am: 823816ee9f am: 20a74298a5
am: e4f35b111e

Change-Id: I9fdb4b5d8e6b1dcf89b853a737f389553cc1a1df
2017-05-08 21:00:47 +00:00
Tom Cherry
e4f35b111e Merge "Revert "Make /data/data a symlink to /data/user/0"" am: 823816ee9f
am: 20a74298a5

Change-Id: I0673663db7b20b44867801f146e49235d15baf8a
2017-05-08 20:56:05 +00:00
Tom Cherry
20a74298a5 Merge "Revert "Make /data/data a symlink to /data/user/0""
am: 823816ee9f

Change-Id: I116babbd8ff696bfd131f3ba4c81055d8339e0eb
2017-05-08 20:53:05 +00:00
Josh Gao
8bf37d7a4d adb: properly handle libusb_clear_halt failure.
The original code used continue to attempt to try to skip the current
device, but there was an loop between the outside one and the continue.
Move the device handling logic into a function and replace continue
with return.

Test: mma
Change-Id: Iaa7f4b5ddc26d2ce03f1172d37d6307190b44412
2017-05-08 13:50:58 -07:00
Treehugger Robot
823816ee9f Merge "Revert "Make /data/data a symlink to /data/user/0"" 2017-05-08 20:46:41 +00:00
Josh Gao
d5a3c01660 Merge "debuggerd_handler: use syscall(__NR_get[pt]id) instead of get[pt]id." am: 2bc6196faa am: fde3c3542a
am: 7182f06223

Change-Id: I851cff4f3d8ae879251910fc207582f188e923b3
2017-05-08 20:34:31 +00:00
Josh Gao
7182f06223 Merge "debuggerd_handler: use syscall(__NR_get[pt]id) instead of get[pt]id." am: 2bc6196faa
am: fde3c3542a

Change-Id: Iae20409ca85ecb0fe18e67005505214cd7e342cc
2017-05-08 20:26:03 +00:00
Josh Gao
fde3c3542a Merge "debuggerd_handler: use syscall(__NR_get[pt]id) instead of get[pt]id."
am: 2bc6196faa

Change-Id: Ie8d68d563dcb1f1756e83bd8ce1770197ef02275
2017-05-08 20:23:01 +00:00
Josh Gao
2bc6196faa Merge "debuggerd_handler: use syscall(__NR_get[pt]id) instead of get[pt]id." 2017-05-08 20:18:34 +00:00
Dan Willemsen
f11e56fb95 Merge changes Ie0b30417,I8b6e802e am: ee9e5d0981 am: ae587a8f19
am: 8652dd2a45

Change-Id: If2e0de6be32ff7bc64c0dbdfcdc4599c8b0a29d7
2017-05-08 18:14:22 +00:00
Dan Willemsen
8652dd2a45 Merge changes Ie0b30417,I8b6e802e am: ee9e5d0981
am: ae587a8f19

Change-Id: Ide8c7b917179474a4060c2360f21bc5c52eee05f
2017-05-08 18:11:25 +00:00
Dan Willemsen
ae587a8f19 Merge changes Ie0b30417,I8b6e802e
am: ee9e5d0981

Change-Id: Ic24a4699bb8dc0590897f4c22df90a2af5a3c693
2017-05-08 18:07:59 +00:00
Dan Willemsen
ee9e5d0981 Merge changes Ie0b30417,I8b6e802e
* changes:
  Turn off debuggerd for host bionic
  Remove old simulator support from liblog
2017-05-08 18:01:27 +00:00
Tom Cherry
756ee8ded9 Merge changes I46690d1c,I84c11aa5 am: 0dda322d4a am: 18b23afa4b
am: 3f9ba91d8f

Change-Id: Ied40226f25303091aad079cf4e8ea1f9ca0379a7
2017-05-08 16:21:15 +00:00
Tom Cherry
3f9ba91d8f Merge changes I46690d1c,I84c11aa5 am: 0dda322d4a
am: 18b23afa4b

Change-Id: I4f46e0285af613f12c533f1235d75887aca19e3b
2017-05-08 16:18:14 +00:00
Tom Cherry
18b23afa4b Merge changes I46690d1c,I84c11aa5
am: 0dda322d4a

Change-Id: I69cc4f5432da891ffa052ad6f56ef21a3bc0e46e
2017-05-08 16:16:23 +00:00
Tom Cherry
0dda322d4a Merge changes I46690d1c,I84c11aa5
* changes:
  init: do not log directly from read_file() and write_file()
  init: Check DecodeUid() result and use error string
2017-05-08 16:11:38 +00:00
Tom Cherry
982e0693ce Revert "Make /data/data a symlink to /data/user/0"
This reverts commit d147cb5887.

Original change breaks AVD
Original changes breaks SF/AF
Bug: 38026755
Bug: 38030346
Bug: 38114264

Change-Id: Iab56244f0dc0f6b0df2916c691277a882fc7d184
2017-05-08 16:06:38 +00:00
Bowgo Tsai
18e92c342a Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" am: 6019991c6e am: 4dd17998ed
am: d6576491fe

Change-Id: Id86ee7f84251e4fd4884dae7fab5677bed2c0501
2017-05-08 15:37:45 +00:00
Bowgo Tsai
d6576491fe Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" am: 6019991c6e
am: 4dd17998ed

Change-Id: I9e1cd04d0e324e58dfced430e10cb50a5ce24f21
2017-05-08 15:34:42 +00:00
Bowgo Tsai
4dd17998ed Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work"
am: 6019991c6e

Change-Id: Id35e60c6f00414d4e71cdc8e670d73c5daa74fbf
2017-05-08 15:31:42 +00:00
Treehugger Robot
6019991c6e Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" 2017-05-08 15:28:13 +00:00
Bowgo Tsai
77cbfd6341 fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work
Should set verity mode to VERITY_MODE_DEFAULT when
androidboot.veritymode=enforcing.

Bug: 38103331
Test: `adb shell getprop partition.system.verified` returns 2 when veritymode=enforcing
Test: `adb shell getprop partition.vendor.verified` returns 2 when veritymode=enforcing
Change-Id: I2f34eb6509f91989ce726e540cf2c0d353347ede
2017-05-08 17:22:52 +08:00
Dan Willemsen
8e5c7bf623 Merge "Assume bionic has up-to-date linux/capability.h" am: 1445c4b932 am: c09d16234f
am: c27f7911b1

Change-Id: Ib66ee19c79c85fccd9dcf419891f99b751957c23
2017-05-07 21:20:35 +00:00
Dan Willemsen
c27f7911b1 Merge "Assume bionic has up-to-date linux/capability.h" am: 1445c4b932
am: c09d16234f

Change-Id: I5cb6df212014e3c9c07ca80c44c9d084649b66bd
2017-05-07 21:17:35 +00:00
Dan Willemsen
c09d16234f Merge "Assume bionic has up-to-date linux/capability.h"
am: 1445c4b932

Change-Id: I01c990451aea493b92689478d6748465f8bd0ac8
2017-05-07 21:15:06 +00:00
Treehugger Robot
1445c4b932 Merge "Assume bionic has up-to-date linux/capability.h" 2017-05-07 21:08:56 +00:00
Dan Willemsen
a4103a85b6 Turn off debuggerd for host bionic
Bug: 31559095
Test: Attempt to build host bionic
Change-Id: Ie0b30417bdc2c59fd4793a79fd23dc9ccd398937
2017-05-07 13:22:01 -07:00
Dan Willemsen
f3452d8178 Remove old simulator support from liblog
As far as I know, this isn't used anymore, and is causing problems when
building with bionic on the host (with the cast of open).

Bug: 31559095
Test: host bionic compiles
Change-Id: I8b6e802e2d6dcc6e8476e387a5a365903aec3be1
2017-05-07 13:21:35 -07:00
Dan Willemsen
0de03b53fc Assume bionic has up-to-date linux/capability.h
The fallback android_filesystem_capability.h doesn't play nicely with
other kernel headers, since it #undef's __user. If we're building with
bionic (either for device or host), we use the same kernel headers, so
just use those.

Bug: 38056396
Test: build with Host_bionic:true
Change-Id: Idc61b6d96d86891164abe71604924638d67aefe2
2017-05-07 12:06:55 -07:00
Bowgo Tsai
b832f991e0 fs_mgr_avb: allow verification error when the device is unlocked
am: a0aaf24d62

Change-Id: Ib8236bed1d228fb848d83ecf513611775867dfbf
2017-05-06 09:11:56 +00:00
Christopher Ferris
2bea1ce330 Merge "Small test fixes." am: 9a4f572a95 am: a61c3db243
am: 1bd88bab0d

Change-Id: I9098b00b271838f8a4c1df6635d1d4de481066cd
2017-05-06 06:39:21 +00:00
Christopher Ferris
1bd88bab0d Merge "Small test fixes." am: 9a4f572a95
am: a61c3db243

Change-Id: I2aeac302d3736ab6c8c7b772b1bf6f07743cd85f
2017-05-06 06:36:50 +00:00
Christopher Ferris
a61c3db243 Merge "Small test fixes."
am: 9a4f572a95

Change-Id: I53c3ab731be17e603e455890e6ae5fb15d033c79
2017-05-06 06:34:21 +00:00
Christopher Ferris
9a4f572a95 Merge "Small test fixes." 2017-05-06 06:30:41 +00:00
Elliott Hughes
0221e94d3e Merge "Give slightly less useless versions to adb and fastboot." am: ddfd5056a2 am: 77ca73f8a7
am: a2ce98d026

Change-Id: I14e89f8165a449948bc77edd02ae29d603901d04
2017-05-06 05:34:47 +00:00
Elliott Hughes
a2ce98d026 Merge "Give slightly less useless versions to adb and fastboot." am: ddfd5056a2
am: 77ca73f8a7

Change-Id: I0529c9d864ee74464d3a46d6184bbdc347a608ee
2017-05-06 05:32:16 +00:00
Elliott Hughes
77ca73f8a7 Merge "Give slightly less useless versions to adb and fastboot."
am: ddfd5056a2

Change-Id: Ia41e72ae4c21b060b9a104a10f4628d24195d915
2017-05-06 05:29:47 +00:00
Elliott Hughes
ddfd5056a2 Merge "Give slightly less useless versions to adb and fastboot." 2017-05-06 05:24:49 +00:00
Yi Kong
f074e428ae Merge "Remove unused lambda captures" am: 5b8a92af5d am: 26f71e6a5a
am: 475a448cf8

Change-Id: Icaac74b600e436a0fa696741ba151ac7a8f00d0d
2017-05-06 01:23:01 +00:00