Commit graph

40554 commits

Author SHA1 Message Date
David Anderson
bba38cda0f Merge "storaged: remove unused includes" am: 0289f35b83
am: 6cebd27db8

Change-Id: Ia6f60132c3026621252015028cb7ebe2559a47bd
2018-04-06 13:30:11 -07:00
David Anderson
6cebd27db8 Merge "storaged: remove unused includes"
am: 0289f35b83

Change-Id: I60f1482e456c351f00e95c50c18eb759501138c9
2018-04-06 13:25:59 -07:00
David Anderson
0289f35b83 Merge "storaged: remove unused includes" 2018-04-06 20:08:50 +00:00
Luis Hector Chavez
fe5ccdf783 [automerger skipped] adb: Correctly drop caps when ambient capabilities are used
am: 2685c77c34  -s ours

Change-Id: I75c23ae508aeb5fbb614e9988ce333e012071f13
2018-04-06 09:32:24 -07:00
Mark Salyzyn
be5235619f resolve merge conflicts of f062a2cd9e to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5eb1bc16bf25b27172b6d2ea355768df2f6d8ff7
2018-04-06 07:56:54 -07:00
Mark Salyzyn
f062a2cd9e Merge "lmkd: only mlockall() if enabled"
am: 7ee579f6ea

Change-Id: I9e4eedbef5caddca9d7f5452dc483a73cb7de728
2018-04-06 07:32:47 -07:00
Mark Salyzyn
7ee579f6ea Merge "lmkd: only mlockall() if enabled" 2018-04-06 14:21:08 +00:00
Luis Hector Chavez
2685c77c34 adb: Correctly drop caps when ambient capabilities are used
This change splits the capability-dropping step of adbd into two. This
is more robust when ambient capabilities are being used, since minijail
cannot currently handle that case.

Bug: 77146512
Test: grep Cap /proc/`pidof adbd`/status
      CapInh: 0000000000000000
      CapPrm: 0000000000000000
      CapEff: 0000000000000000
      CapBnd: 00000000000000c0
      CapAmb: 0000000000000000

Change-Id: I0476a8d80f7a2497600196932542045f3bc87537
Merged-In: I0476a8d80f7a2497600196932542045f3bc87537
(cherry picked from commit daacf4f6f3)
2018-04-06 06:40:14 -07:00
Juho Ha
874a0c37f9 Merge "Make libbinderwrapper available in /vendor partition" am: c593147991
am: d832ea815d

Change-Id: Id4964ce55aa26664170b33e714fc229685941337
2018-04-06 01:06:04 -07:00
Juho Ha
d832ea815d Merge "Make libbinderwrapper available in /vendor partition"
am: c593147991

Change-Id: Ia4111ab5808d0c97d066d3902ad8e4b6af8fbd4c
2018-04-06 00:58:55 -07:00
Juho Ha
c593147991 Merge "Make libbinderwrapper available in /vendor partition" 2018-04-06 07:47:10 +00:00
Elliott Hughes
a5f2f7cc5e Merge "Support /odm and /product in "adb remount" and "adb sync"." am: 6eb9248cb3
am: 9b0d281c4f

Change-Id: Icb2a0362e320f988aae20f7766f2fb39b85569c6
2018-04-05 19:49:11 -07:00
Luis Hector Chavez
39eaab78f2 Merge "adb: Correctly drop caps when ambient capabilities are used" am: 44f78bed19
am: 00b2dffd38

Change-Id: I452f9f2620a0fbd4e2e8d08e90330fb275e2a161
2018-04-05 19:48:10 -07:00
Mark Salyzyn
aa0b84afca Merge "lmkd: test: access /sys/module/lowmemorykiller/ as u:r:shell:s0" am: b69cb7071d
am: 4f7d8851a5

Change-Id: I1ef7aab68bfb5a11891ef4777f6dc46774120a21
2018-04-05 19:45:16 -07:00
Elliott Hughes
9b0d281c4f Merge "Support /odm and /product in "adb remount" and "adb sync"."
am: 6eb9248cb3

Change-Id: I998a0bfa15013c763158db1cda7b06d3271caa43
2018-04-05 19:39:17 -07:00
Luis Hector Chavez
00b2dffd38 Merge "adb: Correctly drop caps when ambient capabilities are used"
am: 44f78bed19

Change-Id: Ifd1f6300a027ad994e57b2c070d180f6e867280d
2018-04-05 19:38:28 -07:00
Mark Salyzyn
4f7d8851a5 Merge "lmkd: test: access /sys/module/lowmemorykiller/ as u:r:shell:s0"
am: b69cb7071d

Change-Id: I230b476f66a86195bfe5cfb3e153960f205cd496
2018-04-05 19:36:01 -07:00
David Anderson
6d65f7c61a storaged: remove unused includes
Bug: 35323867
Test: N/A
Change-Id: I21c0b62765dbd27a462288c5e7577905240720f0
2018-04-05 18:55:08 -07:00
Elliott Hughes
6eb9248cb3 Merge "Support /odm and /product in "adb remount" and "adb sync"." 2018-04-06 01:16:04 +00:00
Treehugger Robot
44f78bed19 Merge "adb: Correctly drop caps when ambient capabilities are used" 2018-04-06 01:05:29 +00:00
Treehugger Robot
b69cb7071d Merge "lmkd: test: access /sys/module/lowmemorykiller/ as u:r:shell:s0" 2018-04-06 00:31:14 +00:00
Juho Ha
fea13b8501 Make libbinderwrapper available in /vendor partition
Some modules in /vendor partition need to use this
library.

Bug: 77626538
Test: Build docs, test_suites_arm64, test_suites_x86_64
      in Android Things branch

Change-Id: Iec50a4dd9af7cd3b426e5d34d0dd1bf923ece627
2018-04-06 08:41:21 +09:00
Elliott Hughes
615b4fdcc1 Merge "Remove the "needs_erase" workaround." am: bd7b2dcaca
am: 10d0c8c37e

Change-Id: I736829b4821559bd2ab4e1cc7436cc9859fabe69
2018-04-05 16:36:49 -07:00
Elliott Hughes
10d0c8c37e Merge "Remove the "needs_erase" workaround."
am: bd7b2dcaca

Change-Id: I51f83909de7ef6ddcca0182be372a9b1f7af22b2
2018-04-05 16:30:41 -07:00
Elliott Hughes
bd7b2dcaca Merge "Remove the "needs_erase" workaround." 2018-04-05 23:23:17 +00:00
Jaekyun Seok
d23dd375ff [automerger skipped] Merge "Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger" into pi-dev
am: a4217d03a7  -s ours

Change-Id: Id178a35bd91bbc6981e0b06de6fc0cb022d8681a
2018-04-05 15:46:22 -07:00
TreeHugger Robot
a4217d03a7 Merge "Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger" into pi-dev 2018-04-05 22:34:43 +00:00
Luis Hector Chavez
daacf4f6f3 adb: Correctly drop caps when ambient capabilities are used
This change splits the capability-dropping step of adbd into two. This
is more robust when ambient capabilities are being used, since minijail
cannot currently handle that case.

Bug: 77146512
Test: grep Cap /proc/`pidof adbd`/status
      CapInh: 0000000000000000
      CapPrm: 0000000000000000
      CapEff: 0000000000000000
      CapBnd: 00000000000000c0
      CapAmb: 0000000000000000

Change-Id: I0476a8d80f7a2497600196932542045f3bc87537
2018-04-05 15:34:05 -07:00
Josh Gao
dab5c00069 Merge "adbd: configure jemalloc to not immediately purge." am: fa1f191ad9
am: 6d200f0982

Change-Id: If954ee1107a9ecb1edd15ba36aeeada7fd6239a9
2018-04-05 15:32:35 -07:00
Josh Gao
6d200f0982 Merge "adbd: configure jemalloc to not immediately purge."
am: fa1f191ad9

Change-Id: I73bb95509c0ded7fb1e4c8755074ccfd1ddb88fe
2018-04-05 15:25:57 -07:00
Treehugger Robot
fa1f191ad9 Merge "adbd: configure jemalloc to not immediately purge." 2018-04-05 22:14:05 +00:00
Josh Gao
218f766e21 adbd: configure jemalloc to not immediately purge.
Profiling of adb_benchmark revealed that something like half of the CPU
time was being spent in malloc and free, which was odd because the
benchmark repeatedly mallocs and frees allocations of the same size. It
turns out that our default configuration of jemalloc will purge after
every free. Configure jemalloc to not do this, for gains of over 100%
on adb_benchmark, and up to 25% (on walleye USB3) in real-life.

Test: adb_benchmark
Change-Id: I602dd1645c3d21709c7f6a78903511ce4d576558
2018-04-05 15:13:30 -07:00
Jaekyun Seok
d082acf3d2 Merge "Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger" am: 5e5509e8fc
am: fb031e37a0

Change-Id: I03d3018bd416cd3dbac237768b1f441223e39238
2018-04-05 14:43:04 -07:00
Jaekyun Seok
fb031e37a0 Merge "Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger"
am: 5e5509e8fc

Change-Id: I8d74085efee03b2dfb94a9566496842a9e774ce4
2018-04-05 14:36:51 -07:00
Treehugger Robot
5e5509e8fc Merge "Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger" 2018-04-05 21:25:02 +00:00
Elliott Hughes
59efd440eb Remove the "needs_erase" workaround.
This workaround shouldn't be necessary now we're using mke2fs.

Bug: http://b/25429933
Test: `fastboot -w flashall`
Change-Id: I577ad445a02a448102fb49674360a732aa3d153c
2018-04-05 14:24:00 -07:00
Tom Cherry
35e8215809 [automerger skipped] Merge "Remove vendor Wifi and BT entries from fs_config.cpp" into pi-dev
am: 587004c48b  -s ours

Change-Id: I40d8b3331dac4c92d5d943d39473d31e0dff41c0
2018-04-05 13:28:04 -07:00
TreeHugger Robot
587004c48b Merge "Remove vendor Wifi and BT entries from fs_config.cpp" into pi-dev 2018-04-05 20:15:49 +00:00
Yifan Hong
b36fb13bf3 Merge changes from topic "healthd_deprecate2" into pi-dev
am: 7498160272

Change-Id: I18b63bfae0890d4e2e7af9ad1a3377334c5139ff
2018-04-05 12:39:47 -07:00
Yifan Hong
7498160272 Merge changes from topic "healthd_deprecate2" into pi-dev
* changes:
  healthd: a.h.health@2.0-service.override removes healthd
  healthd: add healthd.rc
2018-04-05 19:30:35 +00:00
Christopher Ferris
01257c129c Merge "Add a MemoryOfflineBuffer object." into pi-dev
am: 6c985e2a08

Change-Id: Ifece1e0909e791f3c8d92edc5084050ac71dc72c
2018-04-05 11:42:38 -07:00
Joe Onorato
b3063a285c Merge "Make logd more aggressive when scanning for the position from which to resume logging." into pi-dev
am: 4ae7d5c34e

Change-Id: I3bcf64a8cb2726e660fc29efc12eb28de194e527
2018-04-05 11:40:05 -07:00
Christopher Ferris
6c985e2a08 Merge "Add a MemoryOfflineBuffer object." into pi-dev 2018-04-05 18:14:04 +00:00
TreeHugger Robot
4ae7d5c34e Merge "Make logd more aggressive when scanning for the position from which to resume logging." into pi-dev 2018-04-05 18:12:37 +00:00
Tom Cherry
6372af78f5 Merge "Remove vendor Wifi and BT entries from fs_config.cpp" am: 09daaa4991
am: a901c56d2b

Change-Id: Ib4160d75ed147685ccb57e11a274410018e1ad20
2018-04-05 11:02:41 -07:00
Tom Cherry
a901c56d2b Merge "Remove vendor Wifi and BT entries from fs_config.cpp"
am: 09daaa4991

Change-Id: I1cb1ad321ca55785cff45a4fb677b105b92bbf7f
2018-04-05 10:56:33 -07:00
Tom Cherry
07aa2a6131 Remove vendor Wifi and BT entries from fs_config.cpp
Their capability bits are now specified in their associated init .rc
file, which is the proper place for this to be done.

A notice is added to guide developers away from using android_files to
give services Linux capabilities and to guide them away from adding
vendor/ entries.

Bug: 74554159
Test: BT, Wifi, Tethering work on walleye
Merged-In: I13c425d022b4f5c217587cdf601884ef44650ac7
Change-Id: I13c425d022b4f5c217587cdf601884ef44650ac7
(cherry picked from commit b5e5c56401)
2018-04-05 10:40:49 -07:00
Tom Cherry
09daaa4991 Merge "Remove vendor Wifi and BT entries from fs_config.cpp" 2018-04-05 17:39:53 +00:00
Jaekyun Seok
66797804c6 Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger
They are being used as action triggers in some devices including Pixels.
So vendor-init-actionable should be allowed for them.

Bug: 74266614
Test: building succeeded and tested on a Pixel with
PRODUCT_COMPATIBLE_PROPERTY=true

Change-Id: I713c5c1a50053f8d64e1cecd1f7ab5dc18201da1
Merged-In: I713c5c1a50053f8d64e1cecd1f7ab5dc18201da1
(cherry picked from commit 167ec7f1d2)
2018-04-05 23:08:39 +09:00
Jaekyun Seok
167ec7f1d2 Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger
They are being used as action triggers in some devices including Pixels.
So vendor-init-actionable should be allowed for them.

Bug: 74266614
Test: building succeeded and tested on a Pixel with
PRODUCT_COMPATIBLE_PROPERTY=true

Change-Id: I713c5c1a50053f8d64e1cecd1f7ab5dc18201da1
2018-04-05 21:20:59 +09:00