PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,596 Commits 1 Branch 0 Tags
e540feb25eb01bddec3ca9bccb63a23846549af3
Commit Graph

6596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Tao Bao 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
Xin Li 2e0f71a45d Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master am: 85b714c876 
am: 61a066ad36

Change-Id: If494a86cac3d76a2b7120d91b334ab76cda79bb9
 2018-07-23 16:18:16 -07:00
Xin Li 61a066ad36 Merge "Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master" into stage-dr1-aosp-master 
am: 85b714c876

Change-Id: I91da2b1096a4600ad780e78e2e55e17b55a7069f
 2018-07-23 14:06:25 -07:00
Xin Li 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
Hridya Valsaraju ee5163cb1e Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master am: 5c9e580f4f am: 56ba447c57 
am: 320a8ceb7c

Change-Id: I3abd9d8d28ca7eb6c85f0a17b8956d362275a177
 2018-07-23 12:54:41 -07:00
Hridya Valsaraju 320a8ceb7c Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master am: 5c9e580f4f 
am: 56ba447c57

Change-Id: I6edc5cac3a536a64f3ee5bff4de2392149735ee9
 2018-07-23 12:37:31 -07:00
Hridya Valsaraju 56ba447c57 Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master 
am: 5c9e580f4f

Change-Id: Ia92390634bc67f3cffbe3a2644af52abee2bd07f
 2018-07-23 12:30:02 -07:00
TreeHugger Robot 5c9e580f4f Merge "Revert "Make recovery libraries shared / recovery_available"" into stage-aosp-master 2018-07-23 19:18:34 +00:00
Hridya Valsaraju b6b129b258 Revert "Make recovery libraries shared / recovery_available" 
This reverts commit c936a69619.

Reason for revert: b/111734137

Change-Id: Ie9c1fdc75d6e87dba7019c4e6d1799af25c2f94a
 2018-07-23 17:49:14 +00:00
Xin Li 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
Tao Bao bfbe71e900 Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942 am: 4ad9995b5b 
am: f9289591f5

Change-Id: Ib1ecfb99dcffde5570fa9cb32feafc43827da208
 2018-07-20 21:48:38 -07:00
Tao Bao f9289591f5 Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942 
am: 4ad9995b5b

Change-Id: I6a95f04ce99e8e53b749f7873ddf056e3d9dff3f
 2018-07-20 21:17:37 -07:00
Tao Bao 4ad9995b5b Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 
am: 7d2962b942

Change-Id: I299c3ee133280d7996574791fb150a1bab7ad8e2
 2018-07-20 17:37:09 -07:00
Tao Bao 7d2962b942 Merge "applypatch: Change applypatch command-line arguments." 
am: 860b457a15

Change-Id: Ie2d595dbcd8624b8a243f043d04f434d4cf00d5e
 2018-07-20 17:12:08 -07:00
Tao Bao 860b457a15 Merge "applypatch: Change applypatch command-line arguments." 2018-07-20 23:04:33 +00:00
Karl Shaffer 5f6869ad20 Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3 am: 393a97ff8b am: d275207d9d 
am: 95588b8ff2

Change-Id: Iad5f5dbbc95d61f99690f09684024699fe8e9b05
 2018-07-20 13:46:37 -07:00
Karl Shaffer 95588b8ff2 Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3 am: 393a97ff8b 
am: d275207d9d

Change-Id: I78df47b4349fba82b4c0153f7e713992c70c7b10
 2018-07-20 13:43:05 -07:00
Karl Shaffer d275207d9d Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3 
am: 393a97ff8b

Change-Id: I1d51147f51130dd72c56421682a4a4dc2637212d
 2018-07-20 13:37:56 -07:00
Karl Shaffer 393a97ff8b Merge "Updates Wear UI to Display Localized Recovery Text." 
am: 6bc9d605f3

Change-Id: I2ee3cd560f729bb47fc66384f43533b34c4e1382
 2018-07-20 13:33:45 -07:00
Treehugger Robot 6bc9d605f3 Merge "Updates Wear UI to Display Localized Recovery Text." 2018-07-20 20:24:45 +00:00
Jerry Zhang 84dc7c8d68 [automerger skipped] Make recovery libraries shared / recovery_available am: c936a69619 am: 3e8262d633 
am: c11cd3ccb8  -s ours

Change-Id: I97b51ee4a8962814c52f65d0c6bd16947193f191
 2018-07-20 13:24:37 -07:00