Commit Graph

34308 Commits

Author SHA1 Message Date
Bowgo Tsai cb0166b5dd Merge "fs_mgr_verity: support updating actual block device path in verity table" am: 4c28ca1ac8 am: 95d78849b4 am: 3b0512b75c
am: fecd8c26cf

Change-Id: Id343ecda5001d72183cfe782217cb62e8dbe2716
2017-06-10 03:09:53 +00:00
Bowgo Tsai fecd8c26cf Merge "fs_mgr_verity: support updating actual block device path in verity table" am: 4c28ca1ac8 am: 95d78849b4
am: 3b0512b75c

Change-Id: I8d11be54322e57b9bf904907198b7058af7be4df
2017-06-10 03:07:09 +00:00
Bowgo Tsai 3b0512b75c Merge "fs_mgr_verity: support updating actual block device path in verity table" am: 4c28ca1ac8
am: 95d78849b4

Change-Id: Iafd903aaaa22385c6d5c50a294fdca44bf399a24
2017-06-10 03:04:22 +00:00
Bowgo Tsai 95d78849b4 Merge "fs_mgr_verity: support updating actual block device path in verity table"
am: 4c28ca1ac8

Change-Id: I8f35a15f09518bc1757432004a5126c93d1b96ae
2017-06-10 03:02:21 +00:00
Treehugger Robot 4c28ca1ac8 Merge "fs_mgr_verity: support updating actual block device path in verity table" 2017-06-10 02:57:09 +00:00
Hung-ying Tyan 026a220ec2 Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01 -s ours am: 8d87ae4794
am: 6f795616a8

Change-Id: I1171900e86d995772563d91516f5bc2f85a76b84
2017-06-09 08:18:46 +00:00
Hung-ying Tyan 1afcf1b543 Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01 -s ours am: fbdbbeff82
am: 63b84d2c29

Change-Id: I19aaac641db46c703ddaebcf9d6c18828a90ed5c
2017-06-09 08:17:17 +00:00
Hung-ying Tyan 6f795616a8 Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01 -s ours
am: 8d87ae4794

Change-Id: I5f1ec0968a7e53beb6fd7740f0aed0951988df4a
2017-06-09 08:15:55 +00:00
Hung-ying Tyan 63b84d2c29 Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01 -s ours
am: fbdbbeff82

Change-Id: I104ad2700415b253b561fe087745f2fc82b2a572
2017-06-09 08:14:46 +00:00
Hung-ying Tyan 8d87ae4794 Merge "Load default prop from /system/etc/prop.default" into oc-dev
am: 0af496af01  -s ours

Change-Id: Iba712935e81f5a11d524c889f9f7b0ba405f5283
2017-06-09 08:12:20 +00:00
Hung-ying Tyan fbdbbeff82 Merge "Load default prop from /system/etc/prop.default" into oc-dev
am: 0af496af01  -s ours

Change-Id: I5b22d27c22a61ff71bd9046d7b9a88bc7a7e2f7e
2017-06-09 08:12:18 +00:00
Hung-ying Tyan 0af496af01 Merge "Load default prop from /system/etc/prop.default" into oc-dev 2017-06-09 08:04:36 +00:00
Hung-ying Tyan 810d71b005 Load default prop from /system/etc/prop.default
/default.prop is moved to /system/etc/prop.default for full Treblized
devices. Modifies property_service to load it from there first.

Bug: 37815285
Test: Tested with ag/2371424. Booted pixel phones, checked the location
      of pro.default, verified the symlink at /default.prop, checked a
      few properties via adb shell and manually tested a few apps.

Change-Id: I485231f21fc86b0aec58edf867e229a31e77d85e
2017-06-09 13:02:56 +08:00
Yifan Hong d6bb83c42c Mark libqemu_pipe vendor_available am: fabe549af1
am: 2a70f3f502

Change-Id: I73ddf135f840f1a7273fba7478d76bdf416b43a3
2017-06-09 02:44:19 +00:00
Yifan Hong 26129526e6 libqemu: Android.mk -> bp am: e250fd84db
am: 08f48c77e3

Change-Id: Ie7c24acbcd713768bb9aa6b9e95347547114c4fe
2017-06-09 02:44:12 +00:00
Yifan Hong 2a70f3f502 Mark libqemu_pipe vendor_available
am: fabe549af1

Change-Id: Ie4fc80dbea2a30692de77394020a4a28bd0d407f
2017-06-09 02:41:47 +00:00
Yifan Hong 08f48c77e3 libqemu: Android.mk -> bp
am: e250fd84db

Change-Id: I3b0d43304f3636fc9a252e26108511d5136c28e9
2017-06-09 02:41:41 +00:00
Bowgo Tsai c3eca505cd fs_mgr_verity: support updating actual block device path in verity table
The value of PRODUCT_{SYSTEM,VENDOR}_VERITY_PARTITION will be included
in the verity metadata of an image. For example:

    PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/platform/soc.0/f9824900.sdhci/by-name/vendor

This makes the image cannot be shared for devices with different by-name
prefix:
    /dev/block/platform/soc.0/f9824900.sdhci/by-name/vendor
    /dev/block/platform/soc.0/7824900.sdhci/by-name/vendor

This change supports using a generic PRODUCT_{SYSTEM,VENDOR}_VERITY_PARTITION to
build image and replace it with the actual path at run time:

    PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/bootdevice/by-name/vendor ==>
    /dev/block/platform/soc.0/7824900.sdhci/by-name/vendor

Bug: 62171170
Test: Boot sailfish with PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/bootdevice/by-name/vendor
Change-Id: I2789d2a025e80a628a1b4e7419818065c209fb7f
2017-06-09 10:02:42 +08:00
Bowgo Tsai 346e5a0e02 Merge "first stage mount: removing the restriction of mount points" am: 5218d69817 am: 7d491a0a7b am: 7f6df5ddf9
am: 539518269d

Change-Id: I7f2324753078ea9f6c7fb63faebcf51922c464f6
2017-06-09 02:02:39 +00:00
Bowgo Tsai 539518269d Merge "first stage mount: removing the restriction of mount points" am: 5218d69817 am: 7d491a0a7b
am: 7f6df5ddf9

Change-Id: I173bcf7f3989c38d4bf2b08d5cae627b5f47ffc4
2017-06-09 02:00:38 +00:00
Bowgo Tsai 7f6df5ddf9 Merge "first stage mount: removing the restriction of mount points" am: 5218d69817
am: 7d491a0a7b

Change-Id: Idd5dc13632631de213aa341ddcfca9186c2f8510
2017-06-09 01:58:10 +00:00
Bowgo Tsai 7d491a0a7b Merge "first stage mount: removing the restriction of mount points"
am: 5218d69817

Change-Id: I79fa29cf2cbe899362fb93e69b673725160c2579
2017-06-09 01:56:08 +00:00
Treehugger Robot 5218d69817 Merge "first stage mount: removing the restriction of mount points" 2017-06-09 01:51:50 +00:00
Yifan Hong fabe549af1 Mark libqemu_pipe vendor_available
Test: lunch aosp_arm && m -j BOARD_VNDK_VERSION=current

Bug: 38244611
Bug: 62449588

Change-Id: I6f9bc5b1f376a046d05d77436360b32c65981165
2017-06-08 14:16:11 -07:00
Yifan Hong e250fd84db libqemu: Android.mk -> bp
Test: mma

Bug: 37512442
Change-Id: I96f482b3f7734ca217084104b9b733d33459d635
2017-06-08 14:16:11 -07:00
Narayan Kamath 758d3edea1 Merge "tombstoned: turn on java trace support + unit tests." am: 3aaf17fc16 am: dcb4b80694 am: c6f30913bf
am: fcef1a6b13

Change-Id: I3df79218876fe4d7633442cccb924d232e78cc7b
2017-06-08 16:10:53 +00:00
Narayan Kamath fcef1a6b13 Merge "tombstoned: turn on java trace support + unit tests." am: 3aaf17fc16 am: dcb4b80694
am: c6f30913bf

Change-Id: I2df901a03f04a3c3e9981c3a5bdd33bb610dcbba
2017-06-08 13:29:12 +00:00
Narayan Kamath c6f30913bf Merge "tombstoned: turn on java trace support + unit tests." am: 3aaf17fc16
am: dcb4b80694

Change-Id: I209fdf87135d88468bc37f102710078ffe871bdc
2017-06-08 13:26:17 +00:00
Narayan Kamath dcb4b80694 Merge "tombstoned: turn on java trace support + unit tests."
am: 3aaf17fc16

Change-Id: I1865c712e1cd96c360bebab4a6ca733255e81fe2
2017-06-08 13:23:11 +00:00
Narayan Kamath 3aaf17fc16 Merge "tombstoned: turn on java trace support + unit tests." 2017-06-08 13:18:48 +00:00
Josh Gao b7a9ae9b5e adb: libusb: switch from polling for accessibility to a sleep. am: fd79f01baf -s ours
am: 510d093302  -s ours

Change-Id: I15b2ae6a2ede07052aaabbaff31d2986e5195f73
2017-06-08 07:04:42 +00:00
Josh Gao 6dfb97d793 adb: improve race between device_connected and device_disconnected. am: f74dd42e4e -s ours
am: 29c0882ad9  -s ours

Change-Id: I7a96ab6c8bccb622fcb984a5c88ae58960b18818
2017-06-08 07:04:27 +00:00
Josh Gao 510d093302 adb: libusb: switch from polling for accessibility to a sleep.
am: fd79f01baf  -s ours

Change-Id: Ied7a0cb517d9dd88d0e2c645885672a6a83e9112
2017-06-08 06:37:23 +00:00
Josh Gao 29c0882ad9 adb: improve race between device_connected and device_disconnected.
am: f74dd42e4e  -s ours

Change-Id: I09f2d1911142750212a4b9d9ff0ba0c8c142f467
2017-06-08 06:37:13 +00:00
Bowgo Tsai 06ed613e73 first stage mount: removing the restriction of mount points
Current first stage mount only allows three mount points: system, vendor
and/or odm. This was introduced by project Treble to mount those
verified partitions early. However, there might be some other custom
partitions needs to be mounted early as well. This CL removes the
restriction and does first stage mount for whatever specified in
fstab-dt.

Bug: 62423887
Test: first stage mount /vendor with vboot 1.0
Test: first stage mount /vendor with vboot 2.0 (AVB)

Change-Id: I6c146c64e673c35c2823523ccbde193590430c48
2017-06-08 11:30:12 +08:00
Josh Gao 10277e7e9e Merge changes Id51dcb18,I2517dcb9 am: 4db472b779 am: aa3c3fc3be am: 4b32a1f8b8
am: 806ca1a1b0

Change-Id: Ia93bff9a5f86d78d2c1cb18c3e3d0bb5276b1e8e
2017-06-07 20:14:54 +00:00
Josh Gao 806ca1a1b0 Merge changes Id51dcb18,I2517dcb9 am: 4db472b779 am: aa3c3fc3be
am: 4b32a1f8b8

Change-Id: I9b9a5f594dd9a20bbf6dc2fead193433deb51942
2017-06-07 20:12:53 +00:00
Josh Gao 4b32a1f8b8 Merge changes Id51dcb18,I2517dcb9 am: 4db472b779
am: aa3c3fc3be

Change-Id: I095bdeb2621fc49c568d3f7ada8e1abdf688e008
2017-06-07 20:11:22 +00:00
Josh Gao aa3c3fc3be Merge changes Id51dcb18,I2517dcb9
am: 4db472b779

Change-Id: I86c616c6840133a38f8af6b8b9e61b58435bcc32
2017-06-07 20:08:54 +00:00
Treehugger Robot 4db472b779 Merge changes Id51dcb18,I2517dcb9
* changes:
  adb: libusb: switch from polling for accessibility to a sleep.
  adb: improve race between device_connected and device_disconnected.
2017-06-07 20:01:18 +00:00
Josh Gao fd79f01baf adb: libusb: switch from polling for accessibility to a sleep.
For unclear reasons, it seems that for some people, devices are
becoming accessible, inaccessible, and then inaccessible again.
Switch to a sleep for now.

Bug: http://b/62200735
Test: manual
Merged-In: Id51dcb188c3534a57c35cbfd30a181c99115a23c
Change-Id: Id51dcb188c3534a57c35cbfd30a181c99115a23c
(cherry picked from commit 5b8b10e078)
2017-06-07 11:29:21 -07:00
Josh Gao f74dd42e4e adb: improve race between device_connected and device_disconnected.
If a device is unplugged while it's being processed, we can be inside
register_usb_transport still when we call unregister_usb_transport,
leading to bad things happening. Move the call of
register_usb_transport into the scope guarded by usb_handles_mutex.

Bug: http://b/62200735
Test: manual
Merged-In: I2517dcb9d30d9a08cebbb5f715ae3fd30c510109
Change-Id: I2517dcb9d30d9a08cebbb5f715ae3fd30c510109
(cherry picked from commit 7dd382ded9)
2017-06-07 11:29:14 -07:00
Josh Gao 5b8b10e078 adb: libusb: switch from polling for accessibility to a sleep.
For unclear reasons, it seems that for some people, devices are
becoming accessible, inaccessible, and then inaccessible again.
Switch to a sleep for now.

Bug: http://b/62200735
Test: manual
Change-Id: Id51dcb188c3534a57c35cbfd30a181c99115a23c
2017-06-07 11:08:00 -07:00
Josh Gao 7dd382ded9 adb: improve race between device_connected and device_disconnected.
If a device is unplugged while it's being processed, we can be inside
register_usb_transport still when we call unregister_usb_transport,
leading to bad things happening. Move the call of
register_usb_transport into the scope guarded by usb_handles_mutex.

Bug: http://b/62200735
Test: manual
Change-Id: I2517dcb9d30d9a08cebbb5f715ae3fd30c510109
2017-06-07 11:06:53 -07:00
Logan Chien 3ba3276eaa Add libion.so to vndk-sp am: 40624c5d1d -s ours am: 435baf5d00 -s ours
am: 3730fdde78  -s ours

Change-Id: I0ad7be4bf462de839ec728e917aa245800671c4d
2017-06-07 18:05:34 +00:00
Logan Chien c173367328 Add libion.so to vndk-sp am: 40624c5d1d -s ours am: b66870d733 -s ours
am: 4bfa3beac7  -s ours

Change-Id: Ib07f1105289049584f2559752e44793d2161ed0d
2017-06-07 18:05:14 +00:00
Logan Chien 3730fdde78 Add libion.so to vndk-sp am: 40624c5d1d -s ours
am: 435baf5d00  -s ours

Change-Id: Idf8042a77cddcb41d9090c0099ebe6de92b6cb1d
2017-06-07 18:01:39 +00:00
Logan Chien 4bfa3beac7 Add libion.so to vndk-sp am: 40624c5d1d -s ours
am: b66870d733  -s ours

Change-Id: Ie021631876747c1574dc82c56c94654462d0c474
2017-06-07 18:00:39 +00:00
Narayan Kamath ca5e908dd6 tombstoned: turn on java trace support + unit tests.
The SELinux changes that this depends on have now landed.

This change also adds a few lower level unit tests of intercept
functionality.

Test: make; debuggerd_test
Change-Id: I0be5e85e7097e26b71db269c9ed92d9b438bfb28
2017-06-07 18:57:54 +01:00
Logan Chien 435baf5d00 Add libion.so to vndk-sp
am: 40624c5d1d  -s ours

Change-Id: Ifc8472bca50a78be5f75bc4bdec1e51462dbcdf2
2017-06-07 17:57:35 +00:00