2e63f41b4e
Merge "Remove non-A/B mention from README." am: f8b04fe48d am: a5d6a661c6
...
am: e9775341be
2018-08-01 18:01:37 -07:00
e9775341be
Merge "Remove non-A/B mention from README." am: f8b04fe48d
...
am: a5d6a661c6
2018-08-01 17:57:34 -07:00
a5d6a661c6
Merge "Remove non-A/B mention from README."
...
am: f8b04fe48d
2018-08-01 17:55:14 -07:00
f8b04fe48d
Merge "Remove non-A/B mention from README."
2018-08-02 00:44:28 +00:00
c0ec9135d5
Remove non-A/B mention from README.
...
Test: N/A
Change-Id: I8622733d0a23ff062031a67efd0e32480a297322
2018-08-01 15:38:16 -07:00
48f06f134b
Merge "minui: Clean up the use of rotation." am: a9ef617aa7 am: f22aeefaed
...
am: f4e7bec485
2018-08-01 14:39:07 -07:00
f4e7bec485
Merge "minui: Clean up the use of rotation." am: a9ef617aa7
...
am: f22aeefaed
2018-08-01 14:36:06 -07:00
f22aeefaed
Merge "minui: Clean up the use of rotation."
...
am: a9ef617aa7
2018-08-01 14:30:11 -07:00
a9ef617aa7
Merge "minui: Clean up the use of rotation."
2018-08-01 21:20:01 +00:00
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
e0b4784c09
Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6
...
am: 4adfcf962f
2018-08-01 00:31:21 -07:00
4adfcf962f
Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370
...
am: 03f6185ea6
2018-08-01 00:27:20 -07:00
03f6185ea6
Merge "uncrypt: fix f2fs ioctl argument for pin_file"
...
am: 42f40cd370
2018-08-01 00:22:16 -07:00
42f40cd370
Merge "uncrypt: fix f2fs ioctl argument for pin_file"
2018-08-01 07:18:19 +00:00
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
e32cd9bc1a
Merge "recovery: Add ability to interrupt UI" am: 561ee9362c am: 3528139409
...
am: 9e9ef363fb
2018-07-30 16:25:32 -07:00
9e9ef363fb
Merge "recovery: Add ability to interrupt UI" am: 561ee9362c
...
am: 3528139409
2018-07-30 16:20:28 -07:00
3528139409
Merge "recovery: Add ability to interrupt UI"
...
am: 561ee9362c
2018-07-30 16:16:26 -07:00
561ee9362c
Merge "recovery: Add ability to interrupt UI"
2018-07-30 23:04:31 +00:00
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
d5ad243004
Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a am: 06ce8d32e6
...
am: 3bef3a72bd
2018-07-27 16:33:29 -07:00
3bef3a72bd
Merge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a
...
am: 06ce8d32e6
2018-07-27 16:29:25 -07:00
06ce8d32e6
Merge "minadbd: avoid overrriding services_to_fd."
...
am: 6f1f2c811a
2018-07-27 16:25:24 -07:00
6f1f2c811a
Merge "minadbd: avoid overrriding services_to_fd."
2018-07-27 23:17:18 +00:00
1010f723c6
Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b
...
am: dcc5fa4d4f
2018-07-27 14:08:15 -07:00
dcc5fa4d4f
Merge "Move recovery from /sbin to /system/bin" am: 4c80768796
...
am: ed2480be9b
2018-07-27 13:48:29 -07:00
ed2480be9b
Merge "Move recovery from /sbin to /system/bin"
...
am: 4c80768796
2018-07-27 13:34:20 -07:00
4c80768796
Merge "Move recovery from /sbin to /system/bin"
2018-07-27 20:25:53 +00:00
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
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
5612006f31
Merge "Add proto3 support for care_map" am: 8d9b3aec3d am: f3480024c2
...
am: 2a047b9ff3
2018-07-26 13:26:46 -07:00
2a047b9ff3
Merge "Add proto3 support for care_map" am: 8d9b3aec3d
...
am: f3480024c2
2018-07-26 13:12:15 -07:00
f3480024c2
Merge "Add proto3 support for care_map"
...
am: 8d9b3aec3d
2018-07-26 12:48:10 -07:00
8d9b3aec3d
Merge "Add proto3 support for care_map"
2018-07-26 17:57:58 +00:00
0686aa454e
Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23 am: 39e5bdaedb
...
am: f2e7b1757a
2018-07-25 22:05:57 -07:00
f2e7b1757a
Merge "bootloader_message: Build libbootloader_message as shared lib." am: 8515cd5f23
...
am: 39e5bdaedb
2018-07-25 22:02:10 -07:00
39e5bdaedb
Merge "bootloader_message: Build libbootloader_message as shared lib."
...
am: 8515cd5f23
2018-07-25 21:58:08 -07:00
8515cd5f23
Merge "bootloader_message: Build libbootloader_message as shared lib."
2018-07-26 04:48:46 +00:00
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
8ca3220bfe
bootloader_message: Build libbootloader_message as shared lib.
...
And uses the shared lib version of libbase and libfs_mgr.
Bug: 78793464
Test: `m dist`
Test: Run recovery_{unit,component}_test on marlin.
Change-Id: I750c02d0bfccd6e58fb01f641de02532ace52e00
2018-07-25 13:42:33 -07:00
61a066ad36
Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master
...
am: 85b714c876
2018-07-23 14:06:25 -07:00
85b714c876
Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master
2018-07-23 20:53:48 +00:00
320a8ceb7c
Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master am: 5c9e580f4f
...
am: 56ba447c57
2018-07-23 12:37:31 -07:00
56ba447c57
Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master
...
am: 5c9e580f4f
2018-07-23 12:30:02 -07:00
5c9e580f4f
Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master
2018-07-23 19:18:34 +00:00
b6b129b258
Revert "Make recovery libraries shared / recovery_available"
...
This reverts commit c936a69619
2018-07-23 17:49:14 +00:00
bdb8200aaf
Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
...
Bug: 111615259
Change-Id: Ifee8c187c99abad5c496eca2b5bb6f8b8f857ceb
2018-07-22 22:10:17 -07:00
f9289591f5
Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942
...
am: 4ad9995b5b
2018-07-20 21:17:37 -07:00
4ad9995b5b
Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15
...
am: 7d2962b942
2018-07-20 17:37:09 -07:00
7d2962b942
Merge "applypatch: Change applypatch command-line arguments."
...
am: 860b457a15
2018-07-20 17:12:08 -07:00
Zhomart Mukhamejanov
Tao Bao
Jaegeuk Kim
Treehugger Robot
Jerry Zhang
Josh Gao
Hridya Valsaraju
Tianjie Xu
Xin Li