android-build-team Robot
39c4dce352
Snap for 4927259 from 67b66c019a to qt-release
...
Change-Id: I791475248031eb0e2dde1832fd4641da6823d17b
2018-08-02 03:12:15 +00:00
Zhomart Mukhamejanov
67b66c019a
Merge "Remove non-A/B mention from README." am: f8b04fe48d am: a5d6a661c6 am: e9775341be
...
am: 2e63f41b4e
Change-Id: I3721d1dd7f091539d2b37ef488e8abbc21654d29
2018-08-01 18:24:00 -07:00
Zhomart Mukhamejanov
2e63f41b4e
Merge "Remove non-A/B mention from README." am: f8b04fe48d am: a5d6a661c6
...
am: e9775341be
Change-Id: If6b73c231f81b3029c4b475deb42849ab594ecb7
2018-08-01 18:01:37 -07:00
Zhomart Mukhamejanov
e9775341be
Merge "Remove non-A/B mention from README." am: f8b04fe48d
...
am: a5d6a661c6
Change-Id: If168c6ac766a70ed3f8cf82203d8be478fd87f14
2018-08-01 17:57:34 -07:00
Zhomart Mukhamejanov
a5d6a661c6
Merge "Remove non-A/B mention from README."
...
am: f8b04fe48d
Change-Id: Ia46aa857b64b8c344181941013cf2ced7832034f
2018-08-01 17:55:14 -07:00
Zhomart Mukhamejanov
f8b04fe48d
Merge "Remove non-A/B mention from README."
2018-08-02 00:44:28 +00:00
Zhomart Mukhamejanov
c0ec9135d5
Remove non-A/B mention from README.
...
Test: N/A
Change-Id: I8622733d0a23ff062031a67efd0e32480a297322
2018-08-01 15:38:16 -07:00
Tao Bao
caaf964272
Merge "minui: Clean up the use of rotation." am: a9ef617aa7 am: f22aeefaed am: f4e7bec485
...
am: 48f06f134b
Change-Id: If98b52938bd58ab437c7f46bafa9471e3acd6b55
2018-08-01 14:48:45 -07:00
Tao Bao
48f06f134b
Merge "minui: Clean up the use of rotation." am: a9ef617aa7 am: f22aeefaed
...
am: f4e7bec485
Change-Id: Id55014e43e3e97dc773f7e309902831b93c6b2f8
2018-08-01 14:39:07 -07:00
Tao Bao
f4e7bec485
Merge "minui: Clean up the use of rotation." am: a9ef617aa7
...
am: f22aeefaed
Change-Id: I00374d34eaa826b417fead0c14f4b6b803f61fe2
2018-08-01 14:36:06 -07:00
Tao Bao
f22aeefaed
Merge "minui: Clean up the use of rotation."
...
am: a9ef617aa7
Change-Id: Id87dce642ff0c8352c4dea2266cbd08558b20145
2018-08-01 14:30:11 -07:00
Tao Bao
a9ef617aa7
Merge "minui: Clean up the use of rotation."
2018-08-01 21:20:01 +00:00
Tao Bao
44478dfb7d
minui: Clean up the use of rotation.
...
This CL uses scoped enum for GRRotation. It also refactors the previous
comparisions to improve readability -- it was hard to tell the meaning
of `if (rotation % 2)` unless by checking the exact values.
It also temporarily adds STRINGFY to expand the macro of
DEFAULT_ROTATION. This will be removed once minui is changed from
reading build time vars to runtime properties.
Test: Build and boot into recovery image on marlin.
Test: Set `TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT` and check
the display under recovery with `Run graphics test`.
Change-Id: Ieb08b1cd13c284f8dcf906cb2a1430c6bae2835b
2018-08-01 12:30:27 -07:00
Jaegeuk Kim
c141bad787
Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6 am: 4adfcf962f
...
am: e0b4784c09
Change-Id: I02a6691639fdba038a0b707a5d24e747f253f38a
2018-08-01 00:36:53 -07:00
Jaegeuk Kim
e0b4784c09
Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6
...
am: 4adfcf962f
Change-Id: I2efec91672b2772fdde4d7f474e7366f7f5c07a8
2018-08-01 00:31:21 -07:00
Jaegeuk Kim
4adfcf962f
Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370
...
am: 03f6185ea6
Change-Id: I8f185f14b4d0e21f1708f422c914ad5b9b871f5c
2018-08-01 00:27:20 -07:00
Jaegeuk Kim
03f6185ea6
Merge "uncrypt: fix f2fs ioctl argument for pin_file"
...
am: 42f40cd370
Change-Id: I54a58ded52eb11cc6ba2834feda3ad22f4658407
2018-08-01 00:22:16 -07:00
Treehugger Robot
42f40cd370
Merge "uncrypt: fix f2fs ioctl argument for pin_file"
2018-08-01 07:18:19 +00:00
Jaegeuk Kim
2669da0d01
uncrypt: fix f2fs ioctl argument for pin_file
...
This patch fixes missing f2fs ioctl call.
Change-Id: Id840b76b9d5c580041aaee4501ac8e69fc3fb818
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com >
2018-08-01 03:52:51 +00:00
android-build-team Robot
6e0d3d7bfb
Snap for 4922124 from e540feb25e to qt-release
...
Change-Id: Id0d8717cc713e2df9965d31fecae17d0508922f8
2018-07-31 03:02:02 +00:00
Jerry Zhang
e540feb25e
Merge "recovery: Add ability to interrupt UI" am: 561ee9362c am: 3528139409 am: 9e9ef363fb
...
am: e32cd9bc1a
Change-Id: I796540431ab767880929b2c3fd1dd08022f28ed3
2018-07-30 16:31:28 -07:00
Jerry Zhang
e32cd9bc1a
Merge "recovery: Add ability to interrupt UI" am: 561ee9362c am: 3528139409
...
am: 9e9ef363fb
Change-Id: I58f3c31c9afa274872167f3d72575a45bebf2ee4
2018-07-30 16:25:32 -07:00
Jerry Zhang
9e9ef363fb
Merge "recovery: Add ability to interrupt UI" am: 561ee9362c
...
am: 3528139409
Change-Id: If36991f0f57a358cfd1edce8c249fb22672733e1
2018-07-30 16:20:28 -07:00
Jerry Zhang
3528139409
Merge "recovery: Add ability to interrupt UI"
...
am: 561ee9362c
Change-Id: Ic33767a7ebaac6c066c0552b502a361b5c498b9e
2018-07-30 16:16:26 -07:00
Treehugger Robot
561ee9362c
Merge "recovery: Add ability to interrupt UI"
2018-07-30 23:04:31 +00:00
Jerry Zhang
b76af93ab5
recovery: Add ability to interrupt UI
...
Normally calling a UI method will block
indefinitely until the UI is actually
used. This creates a method to interrupt
the UI, causing waitKey to return -2. This
in turn, will cause ShowMenu to return -2.
This allows switching between recovery and
fastbootd via usb commands.
Test: adb shell /data/nativetest64/recovery_unit_test/recovery_unit_test
Bug: 78793464
Change-Id: I4c6c9aa18d79070877841a5c9818acf723fa6096
2018-07-30 20:17:27 +00:00
android-build-team Robot
9e142b34dd
Snap for 4919674 from 40e5596aa7 to qt-release
...
Change-Id: I2499e21a49627b110ad2f25d7e3c97800c31fb59
2018-07-29 03:03:18 +00:00
Josh Gao
40e5596aa7
Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a am: 06ce8d32e6 am: 3bef3a72bd
...
am: d5ad243004
Change-Id: Ied1ebbbbd7f38e0910b8bc4ee697aadea9da86b8
2018-07-27 16:37:32 -07:00
Josh Gao
d5ad243004
Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a am: 06ce8d32e6
...
am: 3bef3a72bd
Change-Id: I8419fb54222a6663b66896f6e8ac919a008b8d1b
2018-07-27 16:33:29 -07:00
Josh Gao
3bef3a72bd
Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a
...
am: 06ce8d32e6
Change-Id: If26f8891a4740e64add9352048609a346b46ba88
2018-07-27 16:29:25 -07:00
Josh Gao
06ce8d32e6
Merge "minadbd: avoid overrriding services_to_fd."
...
am: 6f1f2c811a
Change-Id: Idd6afe20fe9341ee5ff79e6aaf2277490a027e21
2018-07-27 16:25:24 -07:00
Josh Gao
6f1f2c811a
Merge "minadbd: avoid overrriding services_to_fd."
2018-07-27 23:17:18 +00:00
Hridya Valsaraju
673943108c
Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b am: dcc5fa4d4f
...
am: 1010f723c6
Change-Id: Icb130e02e5ec4d05af3ff5270efdb984af4613fd
2018-07-27 14:24:50 -07:00
Hridya Valsaraju
1010f723c6
Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b
...
am: dcc5fa4d4f
Change-Id: I8e38cceea21c232e325f6f55681846696718e68e
2018-07-27 14:08:15 -07:00
Hridya Valsaraju
dcc5fa4d4f
Merge "Move recovery from /sbin to /system/bin" am: 4c80768796
...
am: ed2480be9b
Change-Id: I91dadd30c1a96be668a5e3f295aa3f039f44d494
2018-07-27 13:48:29 -07:00
Hridya Valsaraju
ed2480be9b
Merge "Move recovery from /sbin to /system/bin"
...
am: 4c80768796
Change-Id: I543608d884f1cfe1fea59e78a4a47c6d6c3be4a1
2018-07-27 13:34:20 -07:00
Treehugger Robot
4c80768796
Merge "Move recovery from /sbin to /system/bin"
2018-07-27 20:25:53 +00:00
Josh Gao
038c4a11db
minadbd: avoid overrriding services_to_fd.
...
Previously, we were relying on linker ordering pulling in minadbd's
copy of services_to_fd instead of libadbd's, which breaks when we
switch to dynamically linking. Separate out libadbd's services into a
separate function that's in a file that isn't built into libadbd, so
that we can provide our own here.
Bug: http://b/111831478
Test: mma
Change-Id: I2479947b2d81db5e750020fffc2c2c770cb31a78
2018-07-27 11:18:30 -07:00
Hridya Valsaraju
cfb3c92302
Move recovery from /sbin to /system/bin
...
Executables should be in /system/bin
rather than sbin.
Bug: 78793464
Test: boot into recovery, try adb sideload
Change-Id: I194589119a099d29e56b0648f0906a5ae2aa6770
2018-07-26 17:12:40 -07:00
Tianjie Xu
6c086c4009
Merge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2 am: 2a047b9ff3
...
am: 5612006f31
Change-Id: I48ffce296309d61eba7cc5710a8537d708ff68f3
2018-07-26 14:55:20 -07:00
Tianjie Xu
5612006f31
Merge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2
...
am: 2a047b9ff3
Change-Id: Ie437e57634525c36087f5255934d02c49b42c37c
2018-07-26 13:26:46 -07:00
Tianjie Xu
2a047b9ff3
Merge "Add proto3 support for care_map" am: 8d9b3aec3d
...
am: f3480024c2
Change-Id: Id695d0d49b75c4f0a828bef01bedc36281e15939
2018-07-26 13:12:15 -07:00
Tianjie Xu
f3480024c2
Merge "Add proto3 support for care_map"
...
am: 8d9b3aec3d
Change-Id: Ica2ffa3c1a8d7a9cc2c59a8d30d4dc95907a6882
2018-07-26 12:48:10 -07:00
Tianjie Xu
8d9b3aec3d
Merge "Add proto3 support for care_map"
2018-07-26 17:57:58 +00:00
Tao Bao
388f687a29
Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23 am: 39e5bdaedb am: f2e7b1757a
...
am: 0686aa454e
Change-Id: I4088e371e1f9fba960f1b32c15ed89450e9e1020
2018-07-25 22:09:27 -07:00
Tao Bao
0686aa454e
Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23 am: 39e5bdaedb
...
am: f2e7b1757a
Change-Id: Idfcb05b70c0d26672359ad5d17e0048573c4b353
2018-07-25 22:05:57 -07:00
Tao Bao
f2e7b1757a
Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23
...
am: 39e5bdaedb
Change-Id: I73715616877c05f259f69e275816b1ad28dea818
2018-07-25 22:02:10 -07:00
Tao Bao
39e5bdaedb
Merge "bootloader_message: Build libbootloader_message as shared lib."
...
am: 8515cd5f23
Change-Id: Ideed01697fa7f660fcf2ade93b2f55c55c142479
2018-07-25 21:58:08 -07:00
Tao Bao
8515cd5f23
Merge "bootloader_message: Build libbootloader_message as shared lib."
2018-07-26 04:48:46 +00:00
Tianjie Xu
4d9e62d8a0
Add proto3 support for care_map
...
Switching to the protobuf format helps to make the care_map more
extensible. As we have such plans in the future, add the support to
parse the protobuf message in the update_verifier.
Bug: 77867897
Test: unit tests pass, update_verifier successfully verifies a care_map.pb
Change-Id: I9fe83cb4dd3cc8d6fd0260f2a47338fe142d3938
2018-07-25 14:15:22 -07:00