Commit Graph

35943 Commits

Author SHA1 Message Date
Tom Cherry a53db4220f Merge "init: add exec_background command" am: 424ed42fb4
am: a6d75117e2

Change-Id: Ib912b0423493662faf6bc20718ef4f6e0d4fd545
2017-09-18 21:39:41 +00:00
Tom Cherry a6d75117e2 Merge "init: add exec_background command"
am: 424ed42fb4

Change-Id: I9529146ea9b29b2fb2e2c92f3533efc4e3106943
2017-09-18 21:37:38 +00:00
Tom Cherry 424ed42fb4 Merge "init: add exec_background command" 2017-09-18 21:33:26 +00:00
James Hawkins 8440d77a5f Merge "bootstat: Log the ro.boot.bootreason property through the new platform_reason Tron field." am: 2fb5fa336b
am: 52fe6feeb4

Change-Id: Ic84b6b0beab9adcbc166cf52d8ea5b1a4c05d772
2017-09-18 20:18:42 +00:00
James Hawkins 52fe6feeb4 Merge "bootstat: Log the ro.boot.bootreason property through the new platform_reason Tron field."
am: 2fb5fa336b

Change-Id: I8f719dab152697f6159ea5dc395258e7598e3208
2017-09-18 20:11:09 +00:00
Treehugger Robot 2fb5fa336b Merge "bootstat: Log the ro.boot.bootreason property through the new platform_reason Tron field." 2017-09-18 19:36:40 +00:00
Tom Cherry 3631c545b8 init: add exec_background command
This command functions similarly to `exec` except that it does not
cause init to halt executing commands until the process has
terminated.  It is useful for launching simple one time background
tasks.

Bug: 65736247
Test: create an exec_background service and see it function properly
Change-Id: I719c8b85479b65201770aedc0a13191303007c11
2017-09-18 12:19:47 -07:00
Isaac Chen 844ac8727c Merge "Enable HAS_VFP_D32 for 32-bit armv8 crasher" am: 06c65ed667
am: 51ddfac03c

Change-Id: If32b22051030654d3d2cbc2ca4a6f8fc47f92d44
2017-09-18 02:05:54 +00:00
Isaac Chen 51ddfac03c Merge "Enable HAS_VFP_D32 for 32-bit armv8 crasher"
am: 06c65ed667

Change-Id: I2cc4ef73ae01708b42cdbf9d0d9a6d1f00059cd7
2017-09-18 02:02:54 +00:00
Isaac Chen 06c65ed667 Merge "Enable HAS_VFP_D32 for 32-bit armv8 crasher" 2017-09-18 01:58:02 +00:00
Josh Gao afd41a985b Merge "libbacktrace: make Backtrace::FormatFrameData static." am: 48b68b4944
am: 487f889016

Change-Id: I3c727dba13ca0b04d31b454e866eefb617219eb5
2017-09-15 23:20:36 +00:00
Josh Gao 487f889016 Merge "libbacktrace: make Backtrace::FormatFrameData static."
am: 48b68b4944

Change-Id: I40b80d6609a7e6cd910b129ff463a0f4ef58fa73
2017-09-15 23:18:38 +00:00
Treehugger Robot 48b68b4944 Merge "libbacktrace: make Backtrace::FormatFrameData static." 2017-09-15 23:13:02 +00:00
James Hawkins 5240f204ed bootstat: Log the ro.boot.bootreason property through the new platform_reason Tron field.
Bug: 63584589
Test: none
Change-Id: Ifd6f3d4432d764b5ffc7db10dec5e573214f7c97
2017-09-15 16:01:57 -07:00
Tom Cherry e50fd398ef Merge "init: fix crash when reboot is triggered by a builtin" am: b92415cee2
am: 171587d10e

Change-Id: I000070eca639e129efe50249ecc16a28cfadc6d3
2017-09-15 21:18:47 +00:00
Bill Yi 7b59772553 Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD am: 1eca62a8ce
am: 5096a1b626

Change-Id: I74182a318e98057e68170aaec1e8d2b11dfc7444
2017-09-15 21:18:12 +00:00
Tom Cherry 171587d10e Merge "init: fix crash when reboot is triggered by a builtin"
am: b92415cee2

Change-Id: I4137679d88e58c706f14adeeaf84b41426079de4
2017-09-15 21:14:08 +00:00
Bill Yi 5096a1b626 Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD
am: 1eca62a8ce

Change-Id: I6d6dda22837a2c4f92e94e9bbee4af0d2fb08c39
2017-09-15 21:13:35 +00:00
Tom Cherry b92415cee2 Merge "init: fix crash when reboot is triggered by a builtin" 2017-09-15 21:08:52 +00:00
Tom Cherry 3633a4014a init: fix crash when reboot is triggered by a builtin
Builtin commands may set the sys.powerctl property, which causes
reboot to be immediately processed.  Unfortunately, part of the reboot
processing involves clearing the action queue, so when this scenario
happens, ActionManager::ExecuteOneCommand() can abort due to its state
being unexpectedly changed.

Longer term, the real fix here is to split init and property service.
In this case, the property sets will be sent to property service and
the reboot will only be processed once property service responds back
to init that the property has been set.  Since that will not happen
within the action queue, there will be no risk of failure.

Short term, this change sets a flag in init to shutdown the device
before the next action is run, which defers the shutdown enough to fix
the crash, but continues to prevent any further commands from running.

Bug: 65374456
Test: force bullhead into the repro case and observe that it no longer
      repros

Change-Id: I89c73dad8d7912a845d694b095cab061b8dcc05e
2017-09-15 21:07:41 +00:00
Bill Yi 1eca62a8ce Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD 2017-09-15 13:44:35 -07:00
Tom Cherry 9c374424ae Merge "init: fix hiding of move constructors of Result<T>" am: db7b8f5e28
am: 6213ce0dc1

Change-Id: I66fa4cfd380b1cbe8049965f801efb061b7bb40c
2017-09-15 20:31:27 +00:00
Tom Cherry 6213ce0dc1 Merge "init: fix hiding of move constructors of Result<T>"
am: db7b8f5e28

Change-Id: I933df61a6d5a523b7872ae0d8af091722f7c0e90
2017-09-15 20:29:05 +00:00
Tom Cherry db7b8f5e28 Merge "init: fix hiding of move constructors of Result<T>" 2017-09-15 20:18:21 +00:00
Tom Cherry d1c9cd0499 init: fix hiding of move constructors of Result<T>
This is needed to have Result<Result<T>> work correctly.

Test: init unit tests
Change-Id: If7d23d1ea13f3727b567d3baf0eee1d8d0e5a196
2017-09-15 20:17:38 +00:00
Justin Yun b7f3fd13f5 Merge "Mark libziparchive as VNDK in Android.bp" am: 4ed58aff38
am: cc52f1c947

Change-Id: Ic9f9cd0c35a78000f209dad0b6b8bba88c849d99
2017-09-15 16:33:55 +00:00
Justin Yun 8ca8cecdbc Merge "Mark the modules as VNDK in Android.bp" am: 5d1e740e7f
am: 8c03107614

Change-Id: I8b59cbafbd8fd2c5c990da126cc653aaebbe735e
2017-09-15 16:33:25 +00:00
Justin Yun cc52f1c947 Merge "Mark libziparchive as VNDK in Android.bp"
am: 4ed58aff38

Change-Id: I3a672f2c51564d82fbde804850b9ec4d50a8f764
2017-09-15 16:31:33 +00:00
Justin Yun 8c03107614 Merge "Mark the modules as VNDK in Android.bp"
am: 5d1e740e7f

Change-Id: Ie22de4d907116cf2ba74f875679506a3d2a41feb
2017-09-15 16:31:01 +00:00
Treehugger Robot 4ed58aff38 Merge "Mark libziparchive as VNDK in Android.bp" 2017-09-15 16:23:46 +00:00
Treehugger Robot 5d1e740e7f Merge "Mark the modules as VNDK in Android.bp" 2017-09-15 16:23:30 +00:00
Jae Shin d7b3810816 resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master
am: 0ed84e3e91

Change-Id: I6d9fc1a64b90d52cd71c25313aa63949300e4112
2017-09-15 15:34:02 +00:00
Jae Shin 0ed84e3e91 resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia163118a25cfc2e079803c230d69e55357acd3fa
2017-09-15 16:50:34 +09:00
Isaac Chen 6dc21a5ac5 Enable HAS_VFP_D32 for 32-bit armv8 crasher
Android.bp assumed only an armv7-a-neon core needs to set HAS_VFP_D32.
In fact, an armv8 core also has 32 double-word floating point registers
for A32 and T32 ISAs (AArch32 or 32-bit armv8).

Bug: 65568426
Test: lunch aosp_arm64; emulator # on oc-mr1-dev; boot to home screen.
      Check crashglue.o actually uses VFP_D16-31 for 32-bit armv8 core.
Change-Id: I34584a27fa24a55bb4809ccd7f99a8122971df0e
2017-09-15 15:31:22 +08:00
Jae Shin 0dd4b6aa39 Merge "gatekeeperd: use std::unique_ptr" 2017-09-15 07:00:07 +00:00
Jae Shin d558c377f6 Merge changes I60f883c0,Ie5955865 am: 8c3e940324
am: 3eaaa508e9

Change-Id: I5c3b74944fe4c9899f3692553584130f94b6fdc2
2017-09-15 02:07:50 +00:00
Jae Shin 3eaaa508e9 Merge changes I60f883c0,Ie5955865
am: 8c3e940324

Change-Id: I97b92d3ea89bd81798ec1ca0859197617970069b
2017-09-15 01:41:14 +00:00
Justin Yun 919cc55a7e gatekeeperd: use std::unique_ptr
std::unique_ptr is available in this scope. Substitute the UniquePtr to
std::unique_ptr.

Bug: 63686260
Test: build and boot
Merged-In: Ib8ea3fb5c49c0e92d962f65f1139b073168f8698
Change-Id: Ib8ea3fb5c49c0e92d962f65f1139b073168f8698
(cherry picked from commit 68b0ec6487)
2017-09-15 01:12:43 +00:00
Justin Yun 096114d85c Mark libziparchive as VNDK in Android.bp
As a VNDK module, Android.bp must have 'vndk' tag as well as
'vendor_available: true'.

The 'vndk' tag for VNDK module is formated as below:
vndk: {
    enabled: true,
},

VNDK modules will be installed both in system/lib(64) as normal and
in system/lib(64)/vndk as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Merged-In: Iec5d3496e91a99f3e6b0c816c67ad279672ff36a
Change-Id: Iec5d3496e91a99f3e6b0c816c67ad279672ff36a
(cherry picked from commit 4e7e5b3ba053d013f2c4ae79d02722b874c629fb)
2017-09-15 01:07:40 +00:00
Jae Shin 8c3e940324 Merge changes I60f883c0,Ie5955865
* changes:
  Mark libsync as LL-NDK
  Fix NDK libsync to match ndk/sync.h
2017-09-15 01:02:53 +00:00
Jiyong Park b87f884b99 Mark libsync as LL-NDK
libsync is used both by platform (e.g. libui.so) and by same-process
HALs (e.g. android.hardware.graphics.mapper@2.0-impl.so). Therefore it
is eligible for either VNDK-SP or LL-NDK. Among the two choices, LL-NDK
was selected because it is already an NDK and is just a thin wrapper
around a few kernel ioctls.

However, since libui (which is a vendor_available:true library) is using
more symbols that are not available to NDK clients, the extra symbols
are exposed as # vndk tag so that they are only available to VNDK
clients, but not to NDK clients.

Bug: 63866913
Test: BOARD_VNDK_VERSION=current m -j successful (2017 pixel)
Test: the built image is bootable
Merged-In: I60f883c049bd9b4562e6ce34d34ead47ba28af5f
Change-Id: I60f883c049bd9b4562e6ce34d34ead47ba28af5f
(cherry picked from commit 058e0919f6)
2017-09-15 00:33:52 +00:00
Jesse Hall b5ec6a032c Fix NDK libsync to match ndk/sync.h
The header names were changed during review, but the library map file
wasn't updated.

Bug: 62229958
Test: CtsGraphicsTestCases:android.graphics.cts.SyncTest
Merged-In: Ie5955865667b35067f1ee209933f159f170419cd
Change-Id: Ie5955865667b35067f1ee209933f159f170419cd
(cherry picked from commit 59d9ee5d02)
2017-09-15 00:32:27 +00:00
Josh Gao da20ef4684 Merge changes I0ed00441,I12d46493,Ib484f701 am: 0a01830612
am: 1425641300

Change-Id: I6fbd5287542ee758c6a15fff544b12bac8205eb4
2017-09-14 20:37:14 +00:00
Josh Gao 1425641300 Merge changes I0ed00441,I12d46493,Ib484f701
am: 0a01830612

Change-Id: I8b4566f0daea2181227facea12d82ffd566889b5
2017-09-14 20:35:31 +00:00
Josh Gao 0a01830612 Merge changes I0ed00441,I12d46493,Ib484f701
* changes:
  Revert "adb: fix deadlock between transport_unref and usb_close."
  adb: add lock to remove_socket.
  adb: reformat comments.
2017-09-14 20:04:42 +00:00
Elliott Hughes 07f2b44588 Merge "Update shell and utilities docs for O." am: 1ca9852366
am: 80c5a9bb77

Change-Id: I5126dfd3de3c636f67eb003d47b6fc7b5021a8c9
2017-09-14 19:31:37 +00:00
Elliott Hughes 80c5a9bb77 Merge "Update shell and utilities docs for O."
am: 1ca9852366

Change-Id: Ibc7add73df85e6d8fec29a0531e3ac41df07938e
2017-09-14 19:29:08 +00:00
Treehugger Robot 1ca9852366 Merge "Update shell and utilities docs for O." 2017-09-14 19:22:06 +00:00
Narayan Kamath ad458ebcd6 Merge "tombstoned: Fix calls to evconnlistener_new." am: e997ba9d22
am: 17785d2030

Change-Id: I6193a241c5ed48064e1d22f84c4c47457e0e1c5c
2017-09-14 08:39:34 +00:00
Narayan Kamath 17785d2030 Merge "tombstoned: Fix calls to evconnlistener_new."
am: e997ba9d22

Change-Id: I039af85caf1a81a753caa0c069b3e97253198c59
2017-09-14 08:36:25 +00:00