Commit graph

36627 commits

Author SHA1 Message Date
Tom Cherry
845a91d6b7 Merge "init: fix crash when reboot is triggered by a builtin" am: b92415cee2 am: 171587d10e
am: e50fd398ef

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

Change-Id: I765ebbae03561864cbdc2624cddfa4ecd4c4084f
2017-09-15 21:20:54 +00: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
27d73e9105 Merge "init: fix hiding of move constructors of Result<T>" am: db7b8f5e28 am: 6213ce0dc1
am: 9c374424ae

Change-Id: Ia0f4171d84e484084cc043e64ade4dfa28e88254
2017-09-15 20:34:24 +00: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
7a4b99fdf4 Merge "Mark libziparchive as VNDK in Android.bp" am: 4ed58aff38 am: cc52f1c947
am: b7f3fd13f5  -s ours

Change-Id: If1ef1fb8eaf3742b841f5ddd6f2fe3b5ba0782d0
2017-09-15 16:36:56 +00:00
Justin Yun
30bc0971fb Merge "Mark the modules as VNDK in Android.bp" am: 5d1e740e7f am: 8c03107614
am: 8ca8cecdbc  -s ours

Change-Id: I3b72e4102c154d8d8e14f3d333371f12a58f68ab
2017-09-15 16:36:28 +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
a3fc9b3985 resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master am: 0ed84e3e91
am: d7b3810816  -s ours

Change-Id: Ief1df827ddc756c74abc56f73c9df763afc2f351
2017-09-15 15:36:32 +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
Jae Shin
0dd4b6aa39 Merge "gatekeeperd: use std::unique_ptr" 2017-09-15 07:00:07 +00:00
Jae Shin
d7b005ee23 Merge changes I60f883c0,Ie5955865 am: 8c3e940324 am: 3eaaa508e9
am: d558c377f6  -s ours

Change-Id: I2b56fb9d62e835c9ec5d90c71b564927ea00f71c
2017-09-15 03:35:24 +00:00
Robert Benea
4d4c39ca3b Merge "Downgrade memory pressure events" into oc-mr1-dev
am: 767eb64f36

Change-Id: Iaff6ac534d5bedb25ec2bd93a0d0a53b17cbf8e6
2017-09-15 02:59:20 +00:00
Jae Shin
d558c377f6 Merge changes I60f883c0,Ie5955865 am: 8c3e940324
am: 3eaaa508e9

Change-Id: I5c3b74944fe4c9899f3692553584130f94b6fdc2
2017-09-15 02:07:50 +00:00
TreeHugger Robot
767eb64f36 Merge "Downgrade memory pressure events" into oc-mr1-dev 2017-09-15 01:42:33 +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
Robert Benea
6e8e710675 Downgrade memory pressure events
If the system has enough memory the pressure events are ignored or
downgraded from critical to medium.

Bug: 65642829
Test: tested on gobo
Change-Id: I44e66d2e35508aceee5c1719313db217b80d582e
2017-09-14 13:47:40 -07:00
Josh Gao
2b97b03ba1 Merge changes I0ed00441,I12d46493,Ib484f701 am: 0a01830612 am: 1425641300
am: da20ef4684

Change-Id: I0f5508a13fcf46cd51ca556c13fc43798d4a6fe7
2017-09-14 20:42:30 +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
0fa1eff6bc Merge "Update shell and utilities docs for O." am: 1ca9852366 am: 80c5a9bb77
am: 07f2b44588

Change-Id: Icc71d97a972e849fa054ce441ad1d7652b638632
2017-09-14 19:34:37 +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
Richard Uhler
f5c8cd2ff9 Merge "Revert "Add derive_gid flag for mounting sdcardfs"" into oc-mr1-dev
am: c397915d72

Change-Id: I234383704d430ccfd7f50d4e788d164b8b221786
2017-09-14 15:40:58 +00:00
Josh Gao
dcb92234e4 Merge "debuggerd_fallback: print maps." into oc-mr1-dev
am: 4fda598b08  -s ours

Change-Id: I35b2b9f8ab1f2fc10c4e0212edbd1336e8a51e27
2017-09-14 15:40:30 +00:00
Daniel Rosenberg
2d7de53a73 Merge "Add derive_gid flag for mounting sdcardfs" into oc-mr1-dev
am: 47c5929bb5

Change-Id: Iaae0c0db2d17a402462cfebf07d6d55840a580f1
2017-09-14 15:39:46 +00:00
Richard Uhler
c397915d72 Merge "Revert "Add derive_gid flag for mounting sdcardfs"" into oc-mr1-dev 2017-09-14 14:55:32 +00:00
Jiyong Park
25a03a23a8 Merge changes from topic "vndk_jni" into oc-mr1-dev
am: 6f7d928940

Change-Id: I69af1cdf06bf71f1125644c7064b40444613eaa7
2017-09-14 14:52:51 +00:00