Commit Graph

1481 Commits

Author SHA1 Message Date
Guang Zhu 82ab44ce09 Merge "Revert "Enable metadata encryption"" 2017-04-29 00:01:35 +00:00
Guang Zhu 9709c5a7ff Revert "Enable metadata encryption"
Bug: 37792477

This reverts commit 2bf87eebe4.

Change-Id: I1a43793beda24c01f0fe9e25a7c183af1200fa76
2017-04-28 23:58:55 +00:00
Nick Desaulniers 4f4a2baa21 Merge "Enable metadata encryption" 2017-04-28 21:29:29 +00:00
Paul Lawrence 2bf87eebe4 Enable metadata encryption
Bug: 26778031
Test: Boots, reboots, sector 0 of userdata encrypted
      Make sure an FDE device, both default and password protected,
      boots.
      Make sure an FBE device without metadata encryption boots.
Change-Id: I55135f2d81002f4010a857c021ee840f792f7917
2017-04-28 17:26:30 +00:00
Abodunrinwa Toki 3e6e906448 Merge "Initialize textclassifier model update directory" am: a079e453a3 am: f566376046 am: d13dca13e8
am: 552a4c10b3

Change-Id: I3067795ddd40e8ff1a8eca10fa2188f36c0769ba
2017-04-28 02:30:47 +00:00
Jerry Zhang af96b5e80b Merge "Move adbd stopped trigger for configfs into core." am: e21b2fb6b4 am: fa14b1de73 am: b3988e670d
am: ee82936ecd

Change-Id: Ib276a0384eafe25d81a684c76f8d5d58a5596414
2017-04-28 02:30:11 +00:00
Abodunrinwa Toki 552a4c10b3 Merge "Initialize textclassifier model update directory" am: a079e453a3 am: f566376046
am: d13dca13e8

Change-Id: Icb4af42818bd715709858abfb75e610c52ce48db
2017-04-28 00:44:54 +00:00
Treehugger Robot a079e453a3 Merge "Initialize textclassifier model update directory" 2017-04-28 00:30:26 +00:00
Jerry Zhang ee82936ecd Merge "Move adbd stopped trigger for configfs into core." am: e21b2fb6b4 am: fa14b1de73
am: b3988e670d

Change-Id: I303a29c590df9e018d00e18c1818f8ca0f1dd3ce
2017-04-28 00:04:39 +00:00
Jerry Zhang 423af1a86a Merge "Add ffs.mtp.ready triggers to mtp configs." am: a06ac26dd1 am: c6faf65758 am: 78a4f0f567
am: c9fd178fb0

Change-Id: I09be5a5f34f81b8594184cf64d6897349aa9c82f
2017-04-28 00:02:34 +00:00
Jerry Zhang c9fd178fb0 Merge "Add ffs.mtp.ready triggers to mtp configs." am: a06ac26dd1 am: c6faf65758
am: 78a4f0f567

Change-Id: Ibb785165c83341c098edc254520b0cfeda9c8a79
2017-04-27 22:25:32 +00:00
Jerry Zhang 75f8d89a8a Move adbd stopped trigger for configfs into core.
This trigger resets ffs.ready in situations where
adbd is stopped via commandline.

Test: stop adbd
Change-Id: Ib5028d55c4883a8291d6de2dbcb0641ff8eb7a48
2017-04-27 14:59:48 -07:00
Abodunrinwa Toki 40673e3381 Initialize textclassifier model update directory
Test: Builds successfully. Directory is initialized on install. Tests pass.
bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 34780396

Change-Id: Icbf7962f11b66579931f48053132da6e03e62c61
2017-04-27 22:56:43 +01:00
Jiyong Park b185e01a88 Merge "Relocate VNDK-SP to /system/lib/vndk-sp and add RS libs to VNDK-SP" into oc-dev am: c43a4ad4bc
am: 7eccd838c0

Change-Id: I6a5ec9f6a65ddd39736691c1c208d9ca33ed340c
2017-04-27 01:23:14 +00:00
Jiyong Park 7eccd838c0 Merge "Relocate VNDK-SP to /system/lib/vndk-sp and add RS libs to VNDK-SP" into oc-dev
am: c43a4ad4bc

Change-Id: Ib2c7ba873d7e71aa23bcf28702c2e188f6918c15
2017-04-27 01:12:46 +00:00
Jerry Zhang fb256b696b Add ffs.mtp.ready triggers to mtp configs.
This allows devices to use functionfs for mtp and ptp instead
of the ordinary functions. The property is set regardless of
which function is enabled so mtp and ptp functions will continue
to work.

Bug: 33220530
Test: use mtp with ffs and non ffs devices
Change-Id: I4527e153bd10ef1e262e487482ae455835d1c698
2017-04-26 17:11:50 -07:00
Andreas Gampe 8252e664f3 Merge "Linker: Add ASAN support to treble ld.config" into oc-dev
am: 57e3528d2e

Change-Id: I694aaf1f3307270f973845644dedf51786dcc6cd
2017-04-26 00:39:02 +00:00
Jiyong Park bfa03ee9dc Relocate VNDK-SP to /system/lib/vndk-sp and add RS libs to VNDK-SP
VNDK-SP is relocated back to /system partition from /vendor partition,
following the original design.

In addition, the namespace for RenderScript is added. The namespace is
dedicated for loading VNDK-SP libs for RenderScript such as
libRS_internal.so. The reason for having a separate namespace is that
RenderScript requires more permitted paths (/data/*) which should not be
allowed for normal SP-HALs.

Bug: 37522144
Bug: 37550338
Test: sailfish builds and boots well
Test: lsof shows VNDK-SP libs are loaded from /system/lib/vndk-sp
Test: RenderScript app (CameraScript) runs well
Change-Id: Id139f626cafae2e43ee4eefc5a57a204e31bbbc9
2017-04-26 09:30:36 +09:00
TreeHugger Robot 57e3528d2e Merge "Linker: Add ASAN support to treble ld.config" into oc-dev 2017-04-26 00:28:56 +00:00
Wei Wang 07fc6421cf Merge "Revert "Revert "Ensure update_verifier run before zygote""" am: 5fe07acd07 am: 0380041304 am: b8fdeb4c5a
am: b0d85903cd

Change-Id: I77a093146a7db8651e6a6bd204ccd97ca2e37412
2017-04-25 17:53:34 +00:00
Wei Wang 53842e7dc6 Ensure update_verifier run before zygote
Currently zygote is started early for FBE device but update_verifier is run later
which creates a potential risk. This CL ensures update_verifier run before
zygote touches anything within data/ partition. With this change, we also start zygote
early for unencrypted/unsupported encryption state device.

Bug: 37543411
Test: marlin boots

(cherry picked from commit 5dc05effec)

Change-Id: I97cde0c20f74b1b17c995d84c2e31c86fe006395
2017-04-25 17:49:22 +00:00
Wei Wang b0d85903cd Merge "Revert "Revert "Ensure update_verifier run before zygote""" am: 5fe07acd07 am: 0380041304
am: b8fdeb4c5a

Change-Id: Ief5492dd4b08de351c5ef8c72aeb3ffb09f6feff
2017-04-25 17:46:07 +00:00
Andreas Gampe c7c2d7bcd4 Linker: Add ASAN support to treble ld.config
Add asan counterparts.

Bug: 37579959
Test: m && m SANITIZE_TARGET=address
Merged-in: I23f05436b79fbcb3f6fa11d84c95fcd180fad3b3
Change-Id: I23f05436b79fbcb3f6fa11d84c95fcd180fad3b3
2017-04-25 21:59:37 +09:00
Wei Wang 35a2ee84d5 Revert "Revert "Ensure update_verifier run before zygote""
This reverts commit 2de3344180.

Change-Id: Ifc49bf389ed43a56baf5bb55d5f2028b8725083d
2017-04-24 21:33:12 +00:00
Andreas Gampe 146b9a7254 Linker: Add ASAN support to treble ld.config
Add asan counterparts.

Bug: 37579959
Test: m && m SANITIZE_TARGET=address
Change-Id: I23f05436b79fbcb3f6fa11d84c95fcd180fad3b3
2017-04-24 08:07:53 -07:00
Keun-young Park 4971972b54 Merge "Revert "Ensure update_verifier run before zygote"" am: a037bddd8a am: 615211301e am: 2e211888c0
am: 1a6eb1628c

Change-Id: Ia7afc768cc1f140787f99c021859a99e59fa0762
2017-04-22 01:20:22 +00:00
Keun-young Park 1a6eb1628c Merge "Revert "Ensure update_verifier run before zygote"" am: a037bddd8a am: 615211301e
am: 2e211888c0

Change-Id: Ie9eb8fc13d35a615ff14d120816e675d8ea20f2b
2017-04-22 01:12:06 +00:00
Keun-young Park 2de3344180 Revert "Ensure update_verifier run before zygote"
This reverts commit 5dc05effec.

Change-Id: Ic041860dee8a2993c6b4890beca4da745cfbfb60
2017-04-22 00:43:55 +00:00
Wei Wang 34f0c315d0 Merge "Ensure update_verifier run before zygote" am: a42ec8a9e3 am: 29a0f68c11 am: 73fc12cbda
am: 1214e236eb

Change-Id: I13cb7894245cd242890574473a60a636dc598854
2017-04-21 22:31:11 +00:00
Wei Wang 1214e236eb Merge "Ensure update_verifier run before zygote" am: a42ec8a9e3 am: 29a0f68c11
am: 73fc12cbda

Change-Id: Ife005b30f6115747309f0b3f096f5380e17f192a
2017-04-21 22:28:27 +00:00
Wei Wang 5dc05effec Ensure update_verifier run before zygote
Currently zygote is started early for FBE device but update_verifier is run later
which creates a potential risk. This CL ensures update_verifier run before
zygote touches anything within data/ partition. With this change, we also start zygote
early for unencrypted/unsupported encryption state device.

Bug: 37543411
Test: marlin boots
Change-Id: I95daa73bc1a503eecb70d7be78251b74b773abf8
2017-04-21 11:54:55 -07:00
Keun-young Park d1cb50c66a Merge "early start zygote_secondary as well" am: a0bf415cad am: b7896f0a0d am: 1abccccb71
am: 93ee9b3cb3

Change-Id: I8080e62c965fce0db456e3f61a2098794d5e448e
2017-04-21 17:10:04 +00:00
Keun-young Park 93ee9b3cb3 Merge "early start zygote_secondary as well" am: a0bf415cad am: b7896f0a0d
am: 1abccccb71

Change-Id: I0bf50e54aacc5cd2f967c44dd5176800ee69a695
2017-04-21 17:07:33 +00:00
Keun-young Park 5fb5b81fc7 early start zygote_secondary as well
- late start of zygote_secondary leads into occasional
  1 second wait for starting system service.
- Early start secondary zygote so that there is no additional
  wait.

bug: 37508384
Test: python packages/services/Car/tools/bootanalyze/bootanalyze.py -r -c packages/services/Car/tools/bootanalyze/config.yaml -n 100 -f -e 16 -w 30

(cherry picked from commit f8532445b4)

Change-Id: Ia46b07f3d6abb090cc169ebd807e21b16694d172
2017-04-21 09:55:03 -07:00
Keun-young Park f8532445b4 early start zygote_secondary as well
- late start of zygote_secondary leads into occasional
  1 second wait for starting system service.
- Early start secondary zygote so that there is no additional
  wait.

bug: 37508384
Test: python packages/services/Car/tools/bootanalyze/bootanalyze.py -r -c packages/services/Car/tools/bootanalyze/config.yaml -n 100 -f -e 16 -w 30
Change-Id: I2e4eb0b59a9a8417b56a72fe2de6fa2a6e1ab0a2
2017-04-20 18:31:48 -07:00
Andreas Gampe a2b67d6063 Asan_extract: Use sys.powerctl
rc-style powerctl has beem removed. Accordingly, asan_extract now
needs to access sys.powerctl directly.

Bug: 36458146
Test: m && m SANITIZE_TARGET=address SANITIZE_TARGET_SYSTEM=true
Change-Id: Ic65a858962b4b3dd613fdbfa09f93d21425bf892
2017-04-19 18:32:27 -07:00
Andreas Gampe 4648792228 Asan_extract: Set access flags.
After untar-ing, set correct access flags.

Bug: 36458146
Test: m && m SANITIZE_TARGET=address SANITIZE_TARGET_SYSTEM=true
Change-Id: Ibd98dfaeb58a0040ff2a9fee0bb880a281a673e8
2017-04-19 16:03:39 -07:00
Andreas Gampe cb46b01167 Asan_extract: Add FDE check
Under full-disk encryption, we must skip extracting libraries
into the temporary /data directory. It is too small, and the
framework will not be able to come up.

Add a check for the vold.decrypt system property. As it turns
out that we can't reliably use this, also add a size check
(and use 512M = 131072 4K blocks as the limit).

Bug: 36458146
Test: m && m SANITIZE_TARGET=address SANITIZE_TARGET_SYSTEM=true
Change-Id: Ib350094b049b6e75832d393527b8b62a58a7fece
2017-04-19 16:03:39 -07:00
TreeHugger Robot 1b0895300f Merge changes I33ad185f,I5fc2d727 into oc-dev
* changes:
  init.rc: move load_system_props to beginning of 'on fs'
  liblog: __android_logger_property_bool svelte+eng default
2017-04-19 20:16:15 +00:00
Mark Salyzyn 82a395de27 init.rc: move load_system_props to beginning of 'on fs'
(cherry pick from commit 3510359a3c)

ro.logd.kernel, ro.config.low_ram, ro.logd.timestamp and ro.debuggable
need to be retrieved prior to logd start in order for the service to
behave in a configured manner.  Other essential services are also
dependent on these system properties as well, so it just makes sense
to pick them all up first in 'on fs'.

Test: smoke test
Bug: 37425809
Change-Id: I33ad185f397ee527ed3c84cc2bcb40ff8ca785b5
2017-04-19 17:32:17 +00:00
Wei Wang ac0aa5f30c Merge "init.rc: set initial cpuset to all cores" into oc-dev 2017-04-19 16:49:59 +00:00
Mark Salyzyn 2563a726fb Merge "init.rc: move load_system_props to beginning of 'on fs'" am: 798ac73dcf am: 03393e6f63 am: 925a895266
am: e4f22b16a5

Change-Id: Ib999ec2f8c052a80cd4db64939a77031cd8f2cd5
2017-04-19 16:49:44 +00:00
Mark Salyzyn e4f22b16a5 Merge "init.rc: move load_system_props to beginning of 'on fs'" am: 798ac73dcf am: 03393e6f63
am: 925a895266

Change-Id: I4ea086b0fcf12a0d5df279712807e4e44e82f955
2017-04-19 16:47:51 +00:00
Mark Salyzyn 3510359a3c init.rc: move load_system_props to beginning of 'on fs'
ro.logd.kernel, ro.config.low_ram, ro.logd.timestamp and ro.debuggable
need to be retrieved prior to logd start in order for the service to
behave in a configured manner.  Other essential services are also
dependent on these system properties as well, so it just makes sense
to pick them all up first in 'on fs'.

Test: smoke test
Bug: 37425809
Change-Id: I33ad185f397ee527ed3c84cc2bcb40ff8ca785b5
2017-04-19 14:55:35 +00:00
Tom Cherry 5ceb7b3ebd init: handle sys.powerctl immediately
Currently if a process sets the sys.powerctl property, init adds this
property change into the event queue, just like any other property.
The actual logic to shutdown the device is not executed until init
gets to the action associated with the property change.

This is bad for multiple reasons, but explicitly causes deadlock in
the follow scenario:

A service is started with `exec` or `exec_start`
The same service sets sys.powerctl indicating to the system to
shutdown
The same service then waits infinitely

In this case, init doesn't process any further commands until the exec
service completes, including the command to reboot the device.

This change causes init to immediately handle sys.powerctl and reboot
the device regardless of the state of the event queue, wait for exec,
or wait for property conditions.

Bug: 37209359
Bug: 37415192

Test: Init reboots normally
Test: Update verifier can reboot the system
Change-Id: Iff2295aed970840f47e56c4bacc93001b791fa35
(cherry picked from commit 98ad32a967)
2017-04-18 12:24:58 -07:00
Tom Cherry 3b6367af46 Merge "init: handle sys.powerctl immediately" am: 14ed55bae8 am: e6bfb53196 am: 8972f887d2
am: 1f49801ab1

Change-Id: I6af3f4e1850593f13f27a3fd48f1310e0c3e369c
2017-04-18 18:39:20 +00:00
Tom Cherry 1f49801ab1 Merge "init: handle sys.powerctl immediately" am: 14ed55bae8 am: e6bfb53196
am: 8972f887d2

Change-Id: I3af0841fc3c23e2758ec5f330e9ba03f7695d50f
2017-04-18 18:33:17 +00:00
Tom Cherry 14ed55bae8 Merge "init: handle sys.powerctl immediately" 2017-04-18 18:14:18 +00:00
Jiyong Park dd39cf5e05 Merge "linker: don't allow libui to SP-HALs and fix warning" into oc-dev am: 02012596c1
am: 9cd5ed710b

Change-Id: I730e0cec8bdd2f8dfb6158f50a66a08519b6f562
2017-04-18 03:00:10 +00:00
Jiyong Park 9cd5ed710b Merge "linker: don't allow libui to SP-HALs and fix warning" into oc-dev
am: 02012596c1

Change-Id: Ia82a1515e8e47e5a8a39d5fb214ca8a5690efe5e
2017-04-18 01:51:48 +00:00