Commit graph

44261 commits

Author SHA1 Message Date
TreeHugger Robot
d52aa0301b Merge "Add libbinder_ndk to public.libraries.*" 2018-09-17 23:43:59 +00:00
Xin Li
f1ca87c9eb Merge "Don't attempt to create 'mkdir' and '-p' directories." am: e329879dbf am: 095b6e89db
am: 60af7220a7

Change-Id: Iadb7d808852218a17f7658fd940d78d105e055a3
2018-09-17 16:32:29 -07:00
Xin Li
60af7220a7 Merge "Don't attempt to create 'mkdir' and '-p' directories." am: e329879dbf
am: 095b6e89db

Change-Id: I168e0364798ffb7cc96034227aebd92193cb4626
2018-09-17 16:28:19 -07:00
Xin Li
095b6e89db Merge "Don't attempt to create 'mkdir' and '-p' directories."
am: e329879dbf

Change-Id: Id8d6943e83835e3ab180b689c210f0cf16f91689
2018-09-17 16:22:10 -07:00
Treehugger Robot
e329879dbf Merge "Don't attempt to create 'mkdir' and '-p' directories." 2018-09-17 23:11:28 +00:00
Xin Li
17216455ad Don't attempt to create 'mkdir' and '-p' directories.
Test: build
Bug: 115920063
Change-Id: I65c60bfe0ca758a4213f10754bc872ea9885ca19
2018-09-17 14:20:16 -07:00
Steven Moreland
fbeb8e8c46 Add libbinder_ndk to public.libraries.*
Bug: 111445392
Test: atest android.binder.cts.NdkBinderTest
Change-Id: I8ccb1f74654dcb925cd3ac20042cbffd2f594bb9
(cherry picked from commit fd0dad6825c09b8cc043fd54f679f7782fbf2c26)
2018-09-17 13:04:51 -07:00
Chih-hung Hsieh
eaa4a4ec9f Merge "Suppress implicit-fallthrough warnings." am: 16fef65f9e am: 3784224654
am: 229d380b14

Change-Id: I5b6d3c37333d714cfe89a01d8f933eb0edb470a7
2018-09-17 12:10:36 -07:00
Chih-hung Hsieh
229d380b14 Merge "Suppress implicit-fallthrough warnings." am: 16fef65f9e
am: 3784224654

Change-Id: I42f2e5fcbc5308b3bb2b688bfeda11a496158d4f
2018-09-17 11:47:34 -07:00
Chih-hung Hsieh
3784224654 Merge "Suppress implicit-fallthrough warnings."
am: 16fef65f9e

Change-Id: I71bdcd891f5d41fb90a9e7726aecbf2decdeed2c
2018-09-17 11:29:34 -07:00
Chih-hung Hsieh
16fef65f9e Merge "Suppress implicit-fallthrough warnings." 2018-09-17 17:36:09 +00:00
Chih-Hung Hsieh
502f4864d6 Suppress implicit-fallthrough warnings.
Add FALLTHROUGH_INTENDED for clang compiler.

Bug: 112564944
Test: build with global -Wimplicit-fallthrough.
Change-Id: I40f8bbf94e207c9dd90921e9b762ba51abab5777
2018-09-17 16:50:11 +00:00
Josh Gao
3c2a5166c6 Merge "adbd: fix remount on non-system-as-root devices." am: c2501fda60 am: 31d40d0235
am: 077e5b7dbf

Change-Id: I26821f538dd4e45245e4ebcca766f6bc754cae5e
2018-09-14 18:08:44 -07:00
Peter Collingbourne
5b3930dbbf Merge "libadbd_services: Link libselinux dynamically instead of statically." am: 9cd2a8c2b5 am: 31e1c3f189
am: 29dddac927

Change-Id: Ib27b3e7730b9b8074714959c71336fa66f2f0777
2018-09-14 17:58:47 -07:00
Josh Gao
077e5b7dbf Merge "adbd: fix remount on non-system-as-root devices." am: c2501fda60
am: 31d40d0235

Change-Id: I81de8d605b96d2e7ad55d452e85d63cd185e2224
2018-09-14 17:41:01 -07:00
Peter Collingbourne
29dddac927 Merge "libadbd_services: Link libselinux dynamically instead of statically." am: 9cd2a8c2b5
am: 31e1c3f189

Change-Id: I7cdd09eb7c3461cef08753f8f6bf49e1b19a91e5
2018-09-14 17:31:02 -07:00
Josh Gao
31d40d0235 Merge "adbd: fix remount on non-system-as-root devices."
am: c2501fda60

Change-Id: Idc56e32bc71aa82e0a80cbb1ac537b06e89c7129
2018-09-14 17:20:56 -07:00
Peter Collingbourne
31e1c3f189 Merge "libadbd_services: Link libselinux dynamically instead of statically."
am: 9cd2a8c2b5

Change-Id: I7e65656edf84b4fbc01af69b03f67bea88636493
2018-09-14 17:14:29 -07:00
Treehugger Robot
c2501fda60 Merge "adbd: fix remount on non-system-as-root devices." 2018-09-14 23:24:44 +00:00
Peter Collingbourne
9cd2a8c2b5 Merge "libadbd_services: Link libselinux dynamically instead of statically." 2018-09-14 22:45:55 +00:00
Tom Cherry
922d4e8eea Merge "Add OWNERS for libprocessgroup" am: 8485d59790 am: 8976f4f0d5
am: 45a7ccf915

Change-Id: I409d3eb97724090d3f7811d376f3ead0d139c0d3
2018-09-14 14:38:27 -07:00
Tom Cherry
45a7ccf915 Merge "Add OWNERS for libprocessgroup" am: 8485d59790
am: 8976f4f0d5

Change-Id: Id20b68ae44f5f80d91c3e8ab45cf01ea7be45226
2018-09-14 14:34:18 -07:00
Josh Gao
96d445d846 adbd: fix remount on non-system-as-root devices.
The system image is now a root image, even on devices that don't use
system-as-root. Fix remount to always remount /, to account for this.

Bug: http://b/115751838
Test: `adb remount; adb shell mount | grep " / "`
Change-Id: I2d89a795bd0bc53af33fe69c9d049bbb64d26f3b
2018-09-14 14:32:27 -07:00
Tom Cherry
8976f4f0d5 Merge "Add OWNERS for libprocessgroup"
am: 8485d59790

Change-Id: If7ec55bfe714b14746833abc605638c2931f871d
2018-09-14 14:28:08 -07:00
Treehugger Robot
8485d59790 Merge "Add OWNERS for libprocessgroup" 2018-09-14 21:08:32 +00:00
Tom Cherry
84741f23e2 Merge "Fixed the can not kill some process using libprocessgroup" am: 0799f44497 am: 1b1b0a3700
am: 0ed7988c2b

Change-Id: I8a54930448bb16e44acb692869bc41bfccd96bf1
2018-09-14 11:41:55 -07:00
Tom Cherry
0ed7988c2b Merge "Fixed the can not kill some process using libprocessgroup" am: 0799f44497
am: 1b1b0a3700

Change-Id: Ide3e01ea4eefcc0482d45ba32b04bdbbb3ddbbfd
2018-09-14 11:35:44 -07:00
Tom Cherry
1b1b0a3700 Merge "Fixed the can not kill some process using libprocessgroup"
am: 0799f44497

Change-Id: I629a33f9c950811ae82a0a83a98292934f0eebde
2018-09-14 11:29:20 -07:00
Tom Cherry
b1cb37b077 Add OWNERS for libprocessgroup
Test: n/a
Change-Id: I7c069e439cf1d9d26fd5274647567fb1c5575a72
2018-09-14 11:13:22 -07:00
Tom Cherry
0799f44497 Merge "Fixed the can not kill some process using libprocessgroup" 2018-09-14 18:11:17 +00:00
Yifan Hong
feddee2528 Merge "storaged: change log level for health HAL calls" am: 6d899718ef am: 83df2a732c
am: 1c09a4d12b

Change-Id: I6843cf5153a515fc4b810b57fd8def9aae4781ee
2018-09-14 09:09:21 -07:00
Yifan Hong
1c09a4d12b Merge "storaged: change log level for health HAL calls" am: 6d899718ef
am: 83df2a732c

Change-Id: Ib034a3efffa4e577c914b07ff78f8b539ddd589a
2018-09-14 08:52:28 -07:00
Yifan Hong
83df2a732c Merge "storaged: change log level for health HAL calls"
am: 6d899718ef

Change-Id: Ia705474e6c106078e0a3aaa6f7fd8681077a54aa
2018-09-14 08:45:45 -07:00
Treehugger Robot
6d899718ef Merge "storaged: change log level for health HAL calls" 2018-09-14 15:37:00 +00:00
Tom Cherry
997a7a106e Merge "init: allow using the recovery image for 1st stage init" am: 11b4cde8be am: a883bd37df
am: 60c9e1f2d8

Change-Id: If79a4a9fba24e2f4dcfcd9bca6a2f2b35c6d92ba
2018-09-13 18:08:21 -07:00
Tom Cherry
60c9e1f2d8 Merge "init: allow using the recovery image for 1st stage init" am: 11b4cde8be
am: a883bd37df

Change-Id: Ic92846a815bdd367712128bfb6a61a57feed21aa
2018-09-13 17:51:32 -07:00
Tom Cherry
a883bd37df Merge "init: allow using the recovery image for 1st stage init"
am: 11b4cde8be

Change-Id: Idd58c44fab278d678d3550918c130b9b0192c75f
2018-09-13 17:32:07 -07:00
Tom Cherry
11b4cde8be Merge "init: allow using the recovery image for 1st stage init" 2018-09-13 23:46:14 +00:00
Tom Cherry
bbb1d1a698 init: allow using the recovery image for 1st stage init
For A/B devices, the recovery image is typically provided as a ramdisk
paired with boot.img.  Instead of repartitioning these devices to have
a separate recovery partition and have the new 1st stage ramdisk
paired with the boot.img, this allows setting
androidboot.force_normal_boot=1 on the kernel command line to have init
in recovery boot directly to a normal boot.

This requires /system_recovery_mount to be added in the DT fstab for
the system partition.

Bug: 114062208
Test: hikey boots
Change-Id: I1e331b5cca91152d20ca92549779ab41aa9cd431
2018-09-13 23:45:58 +00:00
Peter Collingbourne
fc0373706d libadbd_services: Link libselinux dynamically instead of statically. 2018-09-13 14:34:04 -07:00
Yifan Hong
539ee58b41 storaged: change log level for health HAL calls
Devices that does not implement getDiskStats and getStorageInfo
returns NOT_SUPPORTED as a value. Do not log to error stream in
this case.
Fixes: 114475810
Test: boots

Change-Id: I95e9ebe23b4dee451cb8f6e8dc0b60a224006600
2018-09-13 09:41:46 -07:00
fengshaobo
950f6f367e Fixed the can not kill some process using libprocessgroup
In DoKillProcessGroupOnce function, if process has a child process, pids set
will be clear probability and initialPid will not be killed, when the pid
is equal to initialPid.

Test: manual - start duomi app and remove it use recent apps key
Change-Id: Ifb9f4acacd725d2c367e547d2b5512807bb44fec
2018-09-13 15:13:13 +08:00
Josh Gao
78816afa81 Merge "Fix multithreaded backtraces for seccomp processes." am: 4cd979fe67 am: 5f1ce5b8a2
am: 715bc6cd52

Change-Id: I123cb48c5cfa6306164b5c5ba194115bc1a2fbd6
2018-09-12 22:32:20 -07:00
Josh Gao
715bc6cd52 Merge "Fix multithreaded backtraces for seccomp processes." am: 4cd979fe67
am: 5f1ce5b8a2

Change-Id: Ibdc143f71631c23b889034bd7587389e1fbade18
2018-09-12 22:26:11 -07:00
Josh Gao
5f1ce5b8a2 Merge "Fix multithreaded backtraces for seccomp processes."
am: 4cd979fe67

Change-Id: I74b64ba64645e6c638e8f5d558f8eda7fc4aec49
2018-09-12 22:21:05 -07:00
Treehugger Robot
4cd979fe67 Merge "Fix multithreaded backtraces for seccomp processes." 2018-09-13 05:11:25 +00:00
Josh Gao
6f9eeecd2b Fix multithreaded backtraces for seccomp processes.
Add threads to the existing seccomp backtrace test to prevent
regressing this.

Bug: http://b/114139908
Bug: http://b/115349586
Test: debuggerd_test32
Test: debuggerd_test64
Change-Id: I07fbe1619b60f0008deb045a249f9045404478c2
2018-09-12 18:12:13 -07:00
Suren Baghdasaryan
b194711a8b [automerger skipped] lmkd: rate-limit and cleanup failed kill reports am: d6cbf3f41d -s ours
am: e603f04e6b  -s ours

Change-Id: Ia701df3276517f59d1c91ffee2d9b55f4448f9f9
2018-09-12 16:34:27 -07:00
Suren Baghdasaryan
e603f04e6b [automerger skipped] lmkd: rate-limit and cleanup failed kill reports
am: d6cbf3f41d  -s ours

Change-Id: Ic59dd4599ce3d9aaf3715aa40a58e9088e68c4ad
2018-09-12 15:41:44 -07:00
Dimitry Ivanov
9c83f49ce5 Merge "Add error_msg argument to CloseNativeLibrary" am: 6590255dbb am: 165121c0c8
am: 27052a7987

Change-Id: I4ad95df23aaa8cf98685b14936a12c0abb17ae69
2018-09-12 13:47:55 -07:00