Christine Hallstrom
9741b4392d
DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e
-s ours am: 3c31204e68
-s ours am: 3a66fd2174
-s ours
...
am: c1f776d7d1
-s ours
Change-Id: Iaf1ca67f9f2d33c2be9af9a4cef1935308cd0c36
2017-07-27 22:41:37 +00:00
Christine Hallstrom
c1f776d7d1
DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e
-s ours am: 3c31204e68
-s ours
...
am: 3a66fd2174
-s ours
Change-Id: I5a2222a551bdfe4077f061131a99c9951cd9c152
2017-07-27 22:38:35 +00:00
Christine Hallstrom
3a66fd2174
DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth am: 2e06a0ff6e
-s ours
...
am: 3c31204e68
-s ours
Change-Id: I251108805c58aabdd41f31a015a6760ea36878e0
2017-07-27 22:35:35 +00:00
Christine Hallstrom
3c31204e68
DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth
...
am: 2e06a0ff6e
-s ours
Change-Id: Ib595080a5bd778e6f844657c785708a37277633f
2017-07-27 22:33:22 +00:00
Christine Hallstrom
2e06a0ff6e
DO NOT MERGE ANYWHERE make /data/misc/bluetooth owner to be bluetooth
...
Bug: 62410937
Change-Id: Ic6ddba03ee6316dc54d5d41b35c90fe3d9057723
2017-07-27 20:55:12 +00:00
TreeHugger Robot
97d2b6d785
Merge "Add system/${LIB}/vndk to default namespace for vendor." into oc-mr1-dev
2017-07-27 15:47:48 +00:00
Josh Gao
60364171da
Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev
...
am: 4ee59e0b51
Change-Id: I418023c78988508c72557f2c7572efa163a174ef
2017-07-27 15:34:59 +00:00
TreeHugger Robot
4ee59e0b51
Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev
2017-07-27 15:26:00 +00:00
Josh Gao
8f484a6896
adbd: add logging to troubleshoot usb issues.
...
Bug: http://b/63899881
Bug: http://b/63901259
Bug: http://b/63904904
Test: treehugger
Change-Id: Ifbc3caa6b416093bf8e127194003747c910352dc
(cherry picked from commit 184f571cfd
)
2017-07-27 00:34:31 -07:00
Siqi Lin
8703536332
rootdir: record last build fingerprint
...
am: b9b76de6ff
Change-Id: I2d781eb8684a860dbb4cb9590ba43bf9d2f3b4c6
2017-07-27 01:21:50 +00:00
Siqi Lin
b9b76de6ff
rootdir: record last build fingerprint
...
We can't copy /default.prop so just write the value of
$(ro.build.fingerprint) to /data/misc/recovery/ro.build.fingerprint
and rotate it after reboot instead.
Bug: 62793047
Test: manual - reboot phone and check /data/misc/recovery
Change-Id: I130a4b7a01d9e1bfe9baecde2781626eb72e768b
2017-07-26 13:40:15 -07:00
Wei Wang
ba6705f9de
Do not umount roofs even if it is R/W.
...
am: b7a8764a12
Change-Id: I56014ac0ae01a5666a58225eed5f89e08859c0d8
2017-07-25 21:34:50 +00:00
Wei Wang
b7a8764a12
Do not umount roofs even if it is R/W.
...
Latest device has rootfs instead of "/system" mount point
(cherry picked from commit a01c27eef8
)
Bug: 37737296
Test: adb remount, reboot, and check log
Change-Id: I315ecf71e85255fc55c3a80619920b456bad0956
2017-07-25 11:39:22 -07:00
Narayan Kamath
385a5dc03a
Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev
...
am: 53ce94588b
-s ours
Change-Id: I5fce7331aae05080d8a68155500ebda45dfe7246
2017-07-25 15:13:24 +00:00
TreeHugger Robot
53ce94588b
Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev
2017-07-25 15:05:01 +00:00
Narayan Kamath
ed218dd556
DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket.
...
Its use is hard-wired off by default. This fixes an SELinux
denial when init tries to create it. We see a denail because
the SELinux aspects of these changes have been reverted on DR
because it's the same API level as oc-dev.
Test: manual
Bug: 63350870
Change-Id: I8b18a25bc14ad9cf79825596ce70483530dd3a8b
2017-07-25 13:17:01 +01:00
Justin Yun
90a2487776
Add system/${LIB}/vndk to default namespace for vendor.
...
With BOARD_VNDK_VERSION=current, vndk libs will be installed in
system/${LIB}/vndk. To make them available for vendor, it must be
added to default namespace.
Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: I9e467a6125fc89513754b56a2420975559144f98
2017-07-25 15:24:28 +09:00
Wei Wang
da4e68944e
init: Fire shutdown trigger for thermal shutdown
...
am: 63a1d0a5f9
Change-Id: I1355e32c56947a79666eb3a58d9299042171a25c
2017-07-25 00:17:29 +00:00
Wei Wang
63a1d0a5f9
init: Fire shutdown trigger for thermal shutdown
...
Recent change in init has bring normal shutdown sequence in
thermal-shutdown condition. This CL will make sure init fire shutdown
trigger where holds custom shutdown actions for vendor SoC/platform.
(cherry picked from commit 1be2212319
)
Bug: 63686426
Test: adb shell setprop sys.powerctl thermal-shutdown
Change-Id: Ieb8579fdf9c30c1a81d60466a7375c9784f3ca98
2017-07-24 14:59:52 -07:00
Jiyong Park
342e022547
Add [test] section for /data/[nativetest|benchmarktest]
...
am: c034a43d44
Change-Id: I11b98ea29bbba4c3bc29f28fe7ba9864306245dd
2017-07-20 17:34:30 +00:00
Jiyong Park
c034a43d44
Add [test] section for /data/[nativetest|benchmarktest]
...
We have both system and vendor tests in the same directory
/data/nativetest. Since we can't distinguish system and vendor tests at
runtime, we choose to run all of them with the legacy namespace
configuration where /system/lib and /vendor/lib are both accessible
without any restriction. Furthermore, /system/lib/vndk-sp is added to
the list of accessible directories for tests since some libs (such as
libion.so) exist only in the directory but not in /system/lib.
This will change in the future when we install system and vendor tests
into different directories (vendor tests goes into ./vendor subdir).
Then, we will run the tests with [system] or [vendor] configurations
depending on their paths.
Bug: 63597267
Test: run bionic-unit-tests
Test: run linker-unit-tests
Change-Id: I810003b2da0b30335200c130f484ea7b041f9f80
2017-07-20 15:28:00 +09:00
Keun-young Park
dde7bfcb84
Merge "init: Do full shutdown even for thermal shutdown" into oc-dr1-dev am: b6962f2e44
-s ours
...
am: ffc080f5d8
-s ours
Change-Id: I4c55ee7052c309440d641398431d5d65e2e4c61b
2017-07-20 06:09:51 +00:00
Keun-young Park
ffc080f5d8
Merge "init: Do full shutdown even for thermal shutdown" into oc-dr1-dev
...
am: b6962f2e44
-s ours
Change-Id: I1b25c4a207802376d4dcdbd26e26535d5e6d1f37
2017-07-20 06:06:19 +00:00
TreeHugger Robot
b6962f2e44
Merge "init: Do full shutdown even for thermal shutdown" into oc-dr1-dev
2017-07-20 06:02:00 +00:00
Christopher Ferris
94d82567d1
Merge "Cleanup the libbacktrace interface a bit." am: e3d470b81d
am: 011f61f39d
am: 8c632cb59a
...
am: 718760c145
Change-Id: I984e38dd8791b1ab82693e67e6fafa594668aa75
2017-07-20 04:16:54 +00:00
Christopher Ferris
640d193186
Merge "Speed up StepIfSignalHandler path." am: c6dd6e8a79
am: df8362bae6
am: fade4fc5c6
...
am: 73fcac8765
Change-Id: Idba9eba2ecf2a7450ae1e4eb20494e2a9f712853
2017-07-20 04:16:27 +00:00
Christopher Ferris
718760c145
Merge "Cleanup the libbacktrace interface a bit." am: e3d470b81d
am: 011f61f39d
...
am: 8c632cb59a
Change-Id: I8724717bc0fe798337a36ec9f1f07405207f3a2a
2017-07-20 04:08:49 +00:00
Christopher Ferris
73fcac8765
Merge "Speed up StepIfSignalHandler path." am: c6dd6e8a79
am: df8362bae6
...
am: fade4fc5c6
Change-Id: Ic19c590b43081d9273977d830b4c33f911930e49
2017-07-20 04:08:24 +00:00
Christopher Ferris
8c632cb59a
Merge "Cleanup the libbacktrace interface a bit." am: e3d470b81d
...
am: 011f61f39d
Change-Id: Ib48f1f649de9cc660838d0883d9051d18ec0c2b9
2017-07-20 03:59:45 +00:00
Christopher Ferris
fade4fc5c6
Merge "Speed up StepIfSignalHandler path." am: c6dd6e8a79
...
am: df8362bae6
Change-Id: Icc16e28e36b88609e20cb5c479c387a2e6d6f73f
2017-07-20 03:59:19 +00:00
Christopher Ferris
011f61f39d
Merge "Cleanup the libbacktrace interface a bit."
...
am: e3d470b81d
Change-Id: Iba1db66328410d9f03660ddea89c2689dd938ebf
2017-07-20 03:53:52 +00:00
Christopher Ferris
df8362bae6
Merge "Speed up StepIfSignalHandler path."
...
am: c6dd6e8a79
Change-Id: Ie0d80840db92a7be958979785b75d3bf4077b030
2017-07-20 03:53:22 +00:00
Keun-young Park
7f6d920369
Merge "dump stack before kill all" into oc-dr1-dev am: 6a55adc92b
-s ours
...
am: 5360d86e53
-s ours
Change-Id: I52da746c65ffbf15d6130eefb9e788cdec535a71
2017-07-20 03:51:37 +00:00
Keun-young Park
5360d86e53
Merge "dump stack before kill all" into oc-dr1-dev
...
am: 6a55adc92b
-s ours
Change-Id: I655617676086e8add3f9cac63df82c62d744607d
2017-07-20 03:47:42 +00:00
Christopher Ferris
e3d470b81d
Merge "Cleanup the libbacktrace interface a bit."
2017-07-20 03:45:06 +00:00
Christopher Ferris
c6dd6e8a79
Merge "Speed up StepIfSignalHandler path."
2017-07-20 03:43:19 +00:00
TreeHugger Robot
6a55adc92b
Merge "dump stack before kill all" into oc-dr1-dev
2017-07-20 03:38:56 +00:00
Keun-young Park
cfa0a9524b
Merge "init: Do full shutdown even for thermal shutdown" am: d5b36f38ef
am: a064892e1a
am: 614ccd7a02
...
am: 44dce1fed7
Change-Id: I1a01555d98864bd13695524e0cb5adff9b49b754
2017-07-20 03:36:25 +00:00
Luke Song
cfe282d570
Merge "resolve merge conflicts of 74a5f22d9
to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
...
am: 1bc31284fa
Change-Id: I88dbbc655a602979a46736c59996dda00f0dfee1
2017-07-20 03:36:07 +00:00
Keun-young Park
44dce1fed7
Merge "init: Do full shutdown even for thermal shutdown" am: d5b36f38ef
am: a064892e1a
...
am: 614ccd7a02
Change-Id: Id714910ec5bdf4b94bfeee238484f4d47a9bdf01
2017-07-20 03:33:42 +00:00
Keun-young Park
614ccd7a02
Merge "init: Do full shutdown even for thermal shutdown" am: d5b36f38ef
...
am: a064892e1a
Change-Id: Ia6ddd5a680caa8283cf9d2a75c1eb49e1c79e413
2017-07-20 03:30:39 +00:00
TreeHugger Robot
1bc31284fa
Merge "resolve merge conflicts of 74a5f22d9
to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
2017-07-20 03:29:27 +00:00
Keun-young Park
a064892e1a
Merge "init: Do full shutdown even for thermal shutdown"
...
am: d5b36f38ef
Change-Id: If0bcd287d2656279a1d364761b0145ca4464299b
2017-07-20 03:27:38 +00:00
Treehugger Robot
d5b36f38ef
Merge "init: Do full shutdown even for thermal shutdown"
2017-07-20 03:21:41 +00:00
Bowgo Tsai
2e774b01f8
Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675
am: 84937296c6
am: e5de94756b
...
am: 2e19aa92ed
Change-Id: If3779eceac8084723c101a6f7fa9091c4f09128e
2017-07-20 02:03:34 +00:00
Bowgo Tsai
2e19aa92ed
Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675
am: 84937296c6
...
am: e5de94756b
Change-Id: Iedca76aea1c93320bbba29bcd013d1cd331380de
2017-07-20 02:01:05 +00:00
Bowgo Tsai
e5de94756b
Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675
...
am: 84937296c6
Change-Id: Ia71076213c9a6770ff35b999024b1d223c82bd77
2017-07-20 01:58:05 +00:00
Bowgo Tsai
84937296c6
Merge "fs_mgr_verity: allow verification error when the device is unlocked"
...
am: a68f633675
Change-Id: Iba60c7f544ae86a1487354a9e799cab7167f37ad
2017-07-20 01:55:04 +00:00
Treehugger Robot
a68f633675
Merge "fs_mgr_verity: allow verification error when the device is unlocked"
2017-07-20 01:48:34 +00:00
Keun-young Park
c111537f5d
init: Do full shutdown even for thermal shutdown
...
- Skipping SIGTERM / SIGKILL / umount brings race between block
device driver and fs layer. Do umount before shutting down.
- Reduce timeout to 1 sec for thermal shutdown and skip other time
taking part like fsck.
- Refactor waiting part to check time in ms so that 1 sec can
have enough resolution.
bug: 63686426
Test: adb shell setprop sys.powerctl thermal-shutdown, adb shell setprop sys.powerctl reboot and check dmesg
Merged-In: I048bac767b328c8d656a97fe65dde5f2b5bf4ae5
Change-Id: I048bac767b328c8d656a97fe65dde5f2b5bf4ae5
2017-07-19 18:38:20 -07:00