Commit Graph
10911 Commits
Author SHA1 Message Date
Xin Liandandroid-build-merger 32ddaab773 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 1ba485fbde -s ours am: 2e3532fa96
am: 11a2fb92c2

Change-Id: I418d00fd604cb0c0775043a798eb147801c62af9
2019-08-14 14:07:47 -07:00
Xin Liandandroid-build-merger 11a2fb92c2 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 1ba485fbde -s ours
am: 2e3532fa96

Change-Id: I081ef878951db254170e2d9a7b72c0eacb36a66a
2019-08-14 13:42:56 -07:00
Xin Liandandroid-build-merger 2e3532fa96 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: 1ba485fbde -s ours
am skip reason: subject contains skip directive

Change-Id: I5048c3ee10b89fc2b94ad9b89a1c17d4a705b786
2019-08-14 13:17:52 -07:00
David Anderson 3cbd7ae687 updater: Fix build for new CreateLogicalPartition signature.
Bug: 135752105
Test: mm libupdater_device
Change-Id: I9dc6dc1e9112177ee5c0a96b8969dc3dc02d95f2
2019-08-14 12:32:55 -07:00
Xin Li 1ba485fbde DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
Bug: 134405016
Change-Id: I98da75f9e4ab07527759b5cc372e14e1f79f2498
2019-08-14 11:35:07 -07:00
Vic Yangandandroid-build-merger c19d76833a Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102 am: 8946524a79 am: e858e2fe81
am: ecca6ec533

Change-Id: I54e76f694fbac10008970dd6e327956a9b684b1d
2019-08-07 19:28:56 -07:00
Vic Yangandandroid-build-merger ecca6ec533 Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102 am: 8946524a79
am: e858e2fe81

Change-Id: If5764dd98d9b45186628f32e7e3a7b470118af23
2019-08-07 19:17:54 -07:00
Vic Yangandandroid-build-merger e858e2fe81 Merge "bootloader_message: Remove global std::string" am: 7b87949ae1 am: 76d80ba102
am: 8946524a79

Change-Id: I65d24597138563a61bc259246e5940948afb1158
2019-08-07 19:07:51 -07:00
Vic Yangandandroid-build-merger 8946524a79 Merge "bootloader_message: Remove global std::string" am: 7b87949ae1
am: 76d80ba102

Change-Id: I5d8cdd458d17129656424e8e09ca52578a5f6c53
2019-08-07 18:56:48 -07:00
Vic Yangandandroid-build-merger 76d80ba102 Merge "bootloader_message: Remove global std::string"
am: 7b87949ae1

Change-Id: I9a374505c325b041876bc7d659d5b211a6d50ca3
2019-08-07 18:47:47 -07:00
Treehugger RobotandGerrit Code Review 7b87949ae1 Merge "bootloader_message: Remove global std::string" 2019-08-08 01:24:29 +00:00
Vic Yang e94b64ae86 bootloader_message: Remove global std::string
A global std::string, even if not used, pollutes the bss section
unnecessarily.  Since this object is only there for testing, make it
std::optional<std::string>, which is constexpr constructible.

Bug: 138856262
Test: Along with a fix in fs_mgr, see that the bss section for
      libbootloader_message.so is now clean on cuttlefish for several
      processes.

Change-Id: I6df837dded88d979ffe14d5b2770b120bcf87341
2019-08-07 14:12:36 -07:00
big biffandGerrit Code Review 69ab4a6000 Merge "fix build error in 9.0 with TW_NO_EXFAT_FUSE:=true" into android-9.0 2019-08-04 00:49:41 +02:00
Tianjie Xuandandroid-build-merger d4d5275616 Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5 am: be3f56543e am: 112acdc043 am: 05fa10519d
am: 4375704cac

Change-Id: I6a875efb54370fca9e29426f4b024ebce13dbf93
2019-07-31 17:46:05 -07:00
Tianjie Xuandandroid-build-merger 4375704cac Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5 am: be3f56543e am: 112acdc043
am: 05fa10519d

Change-Id: I52c6c2af873ddf005bcb4897e677f92b7302b2f5
2019-07-31 17:10:56 -07:00
Tianjie Xuandandroid-build-merger 05fa10519d Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5 am: be3f56543e
am: 112acdc043

Change-Id: I259f6627b736f979884d1797734562266e44981f
2019-07-31 16:49:02 -07:00
Tianjie Xuandandroid-build-merger 112acdc043 Merge "Simulator: add the argument to keep the updated images" am: c34e4e7fb5
am: be3f56543e

Change-Id: Icec27b83fa9dc557fe47c1646867ce453d38c76b
2019-07-31 16:33:59 -07:00
Tianjie Xuandandroid-build-merger be3f56543e Merge "Simulator: add the argument to keep the updated images"
am: c34e4e7fb5

Change-Id: Idb86f6ee1b5a99c626150acaa86d8152b2a8ba99
2019-07-31 16:16:56 -07:00
Tianjie XuandGerrit Code Review c34e4e7fb5 Merge "Simulator: add the argument to keep the updated images" 2019-07-31 22:34:34 +00:00
Tianjie Xu 60b242cfd5 Simulator: add the argument to keep the updated images
Add the command line option to select the work directory and save the
updated image files. Because some people might have interested in
getting updated images from an ota file.

Also, fix a minor issue that the destination of package_extract_file
needs to be updated if it's a block device. Otherwise, an unintended
file may be extracted in the callers' directory.

Test: run simulation, run unit tests

Change-Id: Ic6a7db0580bc1748d6e080102e4654da4e41fd8c
2019-07-30 17:11:35 -07:00
Tianjie Xuandandroid-build-merger 3fb65450b3 Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563 am: c234be1655 am: a89bb37a4c
am: 1c7a5d8421

Change-Id: I8a2aa73845761508b53a03428ee056ddba359429
2019-07-26 11:53:31 -07:00
Tianjie Xuandandroid-build-merger 1c7a5d8421 Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563 am: c234be1655
am: a89bb37a4c

Change-Id: I077384fda0680a73eaa7462773c9144d6d7fc0e2
2019-07-26 11:43:34 -07:00
Tianjie Xuandandroid-build-merger a89bb37a4c Merge "Create a new function to return the help message for menu" am: 5d9f963e4e am: b25d741563
am: c234be1655

Change-Id: Iaa37ebadb460835f94d22eb5771359b10b3eb018
2019-07-26 11:33:27 -07:00
Tianjie Xuandandroid-build-merger c234be1655 Merge "Create a new function to return the help message for menu" am: 5d9f963e4e
am: b25d741563

Change-Id: I3391b38b54596fa08001c39214ebcc98e87285cc
2019-07-26 11:22:24 -07:00
Tianjie Xuandandroid-build-merger b25d741563 Merge "Create a new function to return the help message for menu"
am: 5d9f963e4e

Change-Id: I216097c1aea8ae73999ad9b880dd6898a3c94def
2019-07-26 11:13:22 -07:00
Tianjie XuandGerrit Code Review 5d9f963e4e Merge "Create a new function to return the help message for menu" 2019-07-26 17:39:20 +00:00
Tianjie Xu e5032219fe Create a new function to return the help message for menu
Then we can override this function in the device specific recovery ui;
and allow customizing the help message.

Bug: 137965958
Test: Check the menu on sailfish
Change-Id: I09f23166f4205c5edf6c62eb42c8ada0fa710b26
2019-07-25 13:22:03 -07:00
Tianjie Xuandandroid-build-merger fb08675334 Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022 am: 6f8e0ede72 am: 984dc5c263
am: 0ea09ffbe2

Change-Id: If9028f9d44ef9ae2f6da8c029ff6678240bf8dee
2019-07-24 18:39:21 -07:00
Tianjie Xuandandroid-build-merger 0ea09ffbe2 Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022 am: 6f8e0ede72
am: 984dc5c263

Change-Id: I5df6ce9f82a0535c844b9474dbe57dc4e6e9e316
2019-07-24 18:19:26 -07:00
Tianjie Xuandandroid-build-merger 984dc5c263 Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022
am: 6f8e0ede72

Change-Id: If07039b9393d328d88520cf56c95d7727bda5dc3
2019-07-24 17:57:11 -07:00
Tianjie Xuandandroid-build-merger 6f8e0ede72 Merge "Clean up some global variables in common.h" am: 80c405f692
am: 168ce56022

Change-Id: I7bc150fa572bc9709263feefcd12f786f4393d15
2019-07-24 17:37:03 -07:00
Tianjie Xuandandroid-build-merger 168ce56022 Merge "Clean up some global variables in common.h"
am: 80c405f692

Change-Id: Id50b466efaed118a6e7d1bac71c95000822be855
2019-07-24 17:26:53 -07:00
Tianjie XuandGerrit Code Review 80c405f692 Merge "Clean up some global variables in common.h" 2019-07-24 22:45:32 +00:00
Tianjie Xu 164c60a4f3 Clean up some global variables in common.h
Some global variables are only used for recovery.cpp and
recovery_main.cpp, remove them from common.h and handle their usage
accordingly. Variables include:
static constexpr int kRecoveryApiVersion;
extern struct selabel_handle* sehandle;
extern RecoveryUI* ui;
extern bool has_cache;
bool is_ro_debuggable();

Test: unit tests pass, boot into recovery mode and run graphic tests
Change-Id: If83a005786c9b38412731da97aaf85af69a3b917
2019-07-24 11:36:03 -07:00
android-build-team Robot b23d7132a2 Snap for 5736565 from ac6652d37d to qt-c2f2-release
Change-Id: If08b8829f3d8744f59db0608ab5d3e8529d7eaa2
2019-07-18 03:13:44 +00:00
android-build-team Robot 79fa6bdf6b Snap for 5736389 from ac6652d37d to qt-qpr1-release
Change-Id: I8bdc2d4dde31abe7a2df2061def377bf28ac2ea1
2019-07-18 03:09:56 +00:00
Tianjie Xuandandroid-build-merger e8a435e929 Merge "Add command line parser for simulator" am: 7965a95adc am: 94bc9e1010 am: 7aa310c3f5
am: 2d4d1b9609

Change-Id: Ic71d064d745bc3bd5195e49d1d4c9cd6eedce1db
2019-07-17 11:19:02 -07:00
Tianjie Xuandandroid-build-merger 2d4d1b9609 Merge "Add command line parser for simulator" am: 7965a95adc am: 94bc9e1010
am: 7aa310c3f5

Change-Id: Id76e5c7d5db3c35402bd1ec3facf0748a90e184f
2019-07-17 11:08:42 -07:00
Tianjie Xuandandroid-build-merger 7aa310c3f5 Merge "Add command line parser for simulator" am: 7965a95adc
am: 94bc9e1010

Change-Id: I563cd91537d42c20660a3f04907fea06a8c1fcb7
2019-07-17 10:59:41 -07:00
Tianjie Xuandandroid-build-merger 94bc9e1010 Merge "Add command line parser for simulator"
am: 7965a95adc

Change-Id: Ifa759b9f07a671ad509b0847c30bda4c17edac6c
2019-07-17 10:44:25 -07:00
Tianjie XuandGerrit Code Review 7965a95adc Merge "Add command line parser for simulator" 2019-07-17 17:19:51 +00:00
android-build-team Robot 5a6cde8b02 Merge cherrypicks of [8673593, 8673409, 8673796, 8673797, 8673798, 8673855, 8673151, 8673594, 8673499, 8673799, 8673895, 8673896] into qt-release
Change-Id: I7e089c85c21dbbad3bb7a4b56dfe2edcf2c1c54d
2019-07-17 03:11:39 +00:00
Tao Baoandandroid-build-team Robot 793e8943eb minadbd sends heartbeat to rescue service for getprop command.
We start minadbd and rescue services in two processes. In particular,
minadbd handles the requests from host, then communicates with rescue
service to do install/wipe works. When resuce service doesn't see any
request in a pre-defined timeout (currently 300s), rescue service will
exit to avoid endless waiting.

This CL changes minadbd to additionally send a no-op command to rescue
service as a heartbeat signal, so that host side can finish
time-consuming operations (e.g. downloading over network) while keeping
rescue service alive.

Bug: 136457446
Test: Enter resuce mode on blueline. Send `adb rescue getprop
      ro.build.fingerprint` and check that rescue service doesn't exit.
Test: Stop sending the getprop command. Check that rescue service exits
      after 300s.
Change-Id: Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531
Merged-In: Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531
(cherry picked from commit 2223e6a9f8)
(cherry picked from commit 0bbb2ed53e)
(cherry picked from commit dd0158ac60)
2019-07-17 03:10:07 +00:00
Tao Baoandandroid-build-merger c4d0b1905a Merge "[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: ac6652d37d -s ours
am: 40f08bfc7c -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 dd0158ac60 is in history

Change-Id: I53dec01a5517bf4d55a352523fa38a008d6136ae
2019-07-16 19:14:53 -07:00
Tao Baoandandroid-build-merger 8042057f6e [automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: e64e670fab -s ours
am: db13a9bb58 -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: I7ffebae0e623793f0aed07eb7e5a73755ccf27ae
2019-07-16 19:14:32 -07:00
Android Build Merger (Role)andAndroid (Google) Code Review 40f08bfc7c Merge "[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: ac6652d37d -s ours am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history" into qt-r1-dev-plus-aosp 2019-07-17 01:55:41 +00:00
Tao Baoandandroid-build-merger db13a9bb58 [automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours
am: e64e670fab -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: Ibe0aefbad6255e04c1df79e62d3808e75143a310
2019-07-16 18:55:30 -07:00
Tao Baoandandroid-build-merger 4f7397b0f6 [automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours
am: ac6652d37d -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: Iecbf40ae565dea3f2831cd5faee29690f8ec3724
2019-07-16 18:55:30 -07:00
Tao Baoandandroid-build-merger ac6652d37d [automerger skipped] minadbd sends heartbeat to rescue service for getprop command.
am: dd0158ac60 -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: I02a82fc0d026e06eadbadd6af0af85228ce2e044
2019-07-16 18:46:29 -07:00
Tao Baoandandroid-build-merger e64e670fab [automerger skipped] minadbd sends heartbeat to rescue service for getprop command.
am: dd0158ac60 -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 2223e6a9f8 is in history

Change-Id: I672a987e18b370b2a21d3f39e088b57079a40dab
2019-07-16 18:46:29 -07:00