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

6047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
android-build-prod (mdb) 6cf0a98b93 Merge changes I1cc5d702,I32ab9854 am: 420f7f8df4 am: c4ba6b738f 
am: 13415d9138

Change-Id: If1f0b46e3134fc8a36553ad98f8e03b3e3488f81
 2018-05-04 10:49:39 -07:00
android-build-prod (mdb) 13415d9138 Merge changes I1cc5d702,I32ab9854 am: 420f7f8df4 
am: c4ba6b738f

Change-Id: I7696fb68e13e214ee830b9de1bf66dc6f1cac691
 2018-05-04 10:43:36 -07:00
android-build-prod (mdb) c4ba6b738f Merge changes I1cc5d702,I32ab9854 
am: 420f7f8df4

Change-Id: I4efb48a107303b58c2b40a7a9d8e663c537e5a84
 2018-05-04 10:38:41 -07:00
android-build-prod (mdb) 420f7f8df4 Merge changes I1cc5d702,I32ab9854 
* changes:
  Move reboot() from common.h into otautil/sysutil.h.
  otautil: Rename dir/sys/thermal utils.
 2018-05-04 17:26:11 +00:00
Tao Bao 0ac03af39e Merge "otautil: Only build the needed files for host build." am: 5818e894df am: d7d087f31c 
am: 17a27aa2e2

Change-Id: Ie5268384f4ed8cd98b6d03089bcbfd2b14179f30
 2018-05-04 09:40:55 -07:00
Tao Bao 17a27aa2e2 Merge "otautil: Only build the needed files for host build." am: 5818e894df 
am: d7d087f31c

Change-Id: I2fe3c3b0a718482114bcb744211ed6b9fa1d0904
 2018-05-04 09:36:27 -07:00
Tao Bao d7d087f31c Merge "otautil: Only build the needed files for host build." 
am: 5818e894df

Change-Id: I2c9bf65f56c0bf9fe1d912717ef7952768d9a664
 2018-05-04 09:30:47 -07:00
Tao Bao 5818e894df Merge "otautil: Only build the needed files for host build." 2018-05-04 16:08:18 +00:00
Tao Bao 2c52639d01 Move reboot() from common.h into otautil/sysutil.h. 
This breaks the dependency on common.h (which belongs to
recovery/librecovery) from librecovery_ui. reboot() is now owned by
libotautil, which is expected to be a leaf node to be depended on.

With the change, recovery and updater also share the same reboot() code
now.

Test: mmma -j bootable/recovery
Change-Id: I1cc5d702cfe49302048db33d31c9c87ddc97ac71
 2018-05-03 23:18:38 -07:00
Tao Bao 17054c051a otautil: Rename dir/sys/thermal utils. 
Test: mmma -j bootable/recovery
Change-Id: I32ab98549e91f993364306e4a88dc654221b3869
 2018-05-03 23:17:29 -07:00
Tao Bao 13446c032b otautil: Only build the needed files for host build. 
This avoids unnecessarily breaking mac build.

Test: `mmma -j bootable/recovery` on Linux and macOS.
Change-Id: I1dc00364c895866a4757c2a43beb3432ae1e4113
 2018-05-03 23:16:03 -07:00
Tao Bao 96106592a2 Merge "Move menu headers/items to std::vector<std::string>." am: fb86bb2a07 am: 0d9ed29541 
am: 3777c4b859

Change-Id: I208d2804c2fc6634c8464fdb700756ade977b908
 2018-05-03 17:10:54 -07:00
Zhomart Mukhamejanov 44a3a0b9f1 Merge "updater_sample: update tests" am: 219445a320 am: f3d1e58163 
am: aa1fd35492

Change-Id: Id7e5337a3538b7bb79771a71cea10dfda1af8a75
 2018-05-03 17:02:23 -07:00
Tao Bao 3777c4b859 Merge "Move menu headers/items to std::vector<std::string>." am: fb86bb2a07 
am: 0d9ed29541

Change-Id: I7428f86e9bc3e46c5bcf0afeb3cf5608be31e470
 2018-05-03 16:27:28 -07:00
Tao Bao 0d9ed29541 Merge "Move menu headers/items to std::vector<std::string>." 
am: fb86bb2a07

Change-Id: I1bbef54e7117e8967a63290beaed70521d4de374
 2018-05-03 16:21:16 -07:00
Tao Bao fb86bb2a07 Merge "Move menu headers/items to std::vector<std::string>." 2018-05-03 23:13:09 +00:00
Zhomart Mukhamejanov aa1fd35492 Merge "updater_sample: update tests" am: 219445a320 
am: f3d1e58163

Change-Id: I8140162dd8dd4536b690e24b561a51e749bb9708
 2018-05-03 16:06:20 -07:00
Zhomart Mukhamejanov f3d1e58163 Merge "updater_sample: update tests" 
am: 219445a320

Change-Id: I0f900f7612721b550826f0daffb030377468292b
 2018-05-03 16:02:18 -07:00
Zhomart Mukhamejanov 219445a320 Merge "updater_sample: update tests" 2018-05-03 22:52:36 +00:00
Zhomart Mukhamejanov e606f6d3ff updater_sample: update tests 
- fix tools/gen_update_config.py
- add tests for PayloadSpecs#forStreaming

Test: junit4
Change-Id: Ife1980c5f72944ed35500aa820b30031fc99e820
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
 2018-05-03 14:04:16 -07:00
Tao Bao 1fe1afe863 Move menu headers/items to std::vector<std::string>. 
Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin.
Test: Build and boot into recovery image on angler. Check the UI that
      shows menu ('View recovery log', 'Wipe data', 'Run locale test').
Test: Start recovery with '--prompt_and_wipe_data'. Check the UI.
Change-Id: If8a4209e0bb4ca64f719f9f9465d3b3589a69cdc
 2018-05-03 12:31:18 -07:00
Zhomart Mukhamejanov 8c9ac4c715 Merge "updater_sample: update ui and README, clean-up" am: 9c544a2bc6 am: c36f5ff1c7 
am: d3df835f3f

Change-Id: Iaa1acc86c6225c6d302d7307acf8c67f693726d7
 2018-05-03 11:13:29 -07:00
Zhomart Mukhamejanov d3df835f3f Merge "updater_sample: update ui and README, clean-up" am: 9c544a2bc6 
am: c36f5ff1c7

Change-Id: I20dda655819ad895a9a004c012d37243d8053d5f
 2018-05-03 11:03:14 -07:00
Zhomart Mukhamejanov c36f5ff1c7 Merge "updater_sample: update ui and README, clean-up" 
am: 9c544a2bc6

Change-Id: I01da369a194bdb0b4d6d698dd835ce3bf9904756
 2018-05-03 10:58:13 -07:00
Zhomart Mukhamejanov 9c544a2bc6 Merge "updater_sample: update ui and README, clean-up" 2018-05-03 17:47:59 +00:00
Zhomart Mukhamejanov f7a70388ee updater_sample: update ui and README, clean-up 
- ui: add text view for latest completion (error) code
- update README.md
- update MainActivity.java
- remove AbNonStreamingUpdate

Test: mmma bootable/recovery/updater_sample
Change-Id: Ie9bb64211c57d536036b04f13896e4937c392b6e
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
 2018-05-03 14:59:45 +00:00
android-build-prod (mdb) 5ba2fa1c4e Merge "screen_ui: Merge Menu::Start() into its ctor." am: 0cabcd0126 am: bcf8beaeed 
am: 704d11fac2

Change-Id: Ica240779f3b59008b1fb97677ced878c58a1a8cb
 2018-05-02 22:09:22 -07:00
android-build-prod (mdb) 704d11fac2 Merge "screen_ui: Merge Menu::Start() into its ctor." am: 0cabcd0126 
am: bcf8beaeed

Change-Id: I3fdc5fb0f72c36e225cb26fc643e39b254bc492e
 2018-05-02 22:05:21 -07:00
android-build-prod (mdb) bcf8beaeed Merge "screen_ui: Merge Menu::Start() into its ctor." 
am: 0cabcd0126

Change-Id: I739ab9b6d3aa2a52f2fd51adbf84664301f22ca6
 2018-05-02 22:01:49 -07:00
android-build-prod (mdb) 0cabcd0126 Merge "screen_ui: Merge Menu::Start() into its ctor." 2018-05-03 04:54:24 +00:00
Zhomart Mukhamejanov bf13b18dd9 Merge "updater_sample: Add streaming to PayloadSpec" am: 3a79b36377 am: 98837bdcd1 
am: 2e8e6e3ab4

Change-Id: Iee52b8119d33c32859ff84abf7fd678916b07f32
 2018-05-02 20:34:25 -07:00
Zhomart Mukhamejanov 2e8e6e3ab4 Merge "updater_sample: Add streaming to PayloadSpec" am: 3a79b36377 
am: 98837bdcd1

Change-Id: I46ccdf6e51ed48cf5eec21b21d8b70ed5b376df9
 2018-05-02 20:30:53 -07:00
Zhomart Mukhamejanov 98837bdcd1 Merge "updater_sample: Add streaming to PayloadSpec" 
am: 3a79b36377

Change-Id: I576233f982e2dea6abeb9267ffddc2760dad4d4e
 2018-05-02 20:27:20 -07:00
Zhomart Mukhamejanov 3a79b36377 Merge "updater_sample: Add streaming to PayloadSpec" 2018-05-03 03:22:45 +00:00
android-build-prod (mdb) 4671350c5d Merge "screen_ui: Use std::string in DrawTextLine() and siblings." am: b4ded4a6ce am: a9d78d45d6 
am: 01118c1cd8

Change-Id: I183c66d87b58a0eb55563568e2a263ac170cd851
 2018-05-02 19:31:04 -07:00
Tao Bao e02a5b248b screen_ui: Merge Menu::Start() into its ctor. 
Since we instantiate a Menu object each time for a given set of
header/items, we don't have a use case of re-populating an existing Menu
with different data (which is what Menu::Start() does).

Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin.
Test: Build and boot into recovery image on angler. Check the UI.
Change-Id: Iaa2ba9d406ebd74c015e43198c17c5335b38df53
 2018-05-02 19:30:15 -07:00
android-build-prod (mdb) 01118c1cd8 Merge "screen_ui: Use std::string in DrawTextLine() and siblings." am: b4ded4a6ce 
am: a9d78d45d6

Change-Id: I6b4ea6332a9416ac8036cd9c2d1d23695a7c5914
 2018-05-02 19:21:02 -07:00
android-build-prod (mdb) a9d78d45d6 Merge "screen_ui: Use std::string in DrawTextLine() and siblings." 
am: b4ded4a6ce

Change-Id: I02fad9395511c716d790f1a1e3f5065532a8433b
 2018-05-02 19:16:59 -07:00
android-build-prod (mdb) b4ded4a6ce Merge "screen_ui: Use std::string in DrawTextLine() and siblings." 2018-05-03 02:12:48 +00:00
Tao Bao 1c24bd6f39 Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8 am: 30f2775b37 
am: 1875991c71

Change-Id: I6995f59e2a6859d5b5d1e5cdf49c0f19261b829f
 2018-05-02 15:45:52 -07:00
Tao Bao 93e46ad426 screen_ui: Use std::string in DrawTextLine() and siblings. 
Test: mmma -j bootable/recovery
Test: Build and boot into recovery image on angler. Check the UI.
Test: Repeat the same test on devices using wearable UI.
Change-Id: I1a67ff4ae8de4d7a8dc66326cf07f95c89e95152
 2018-05-02 15:32:48 -07:00
Tao Bao 1875991c71 Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8 
am: 30f2775b37

Change-Id: Id553c1f1de86fa292c0327f6fcc00fb8cd17bec3
 2018-05-02 14:49:56 -07:00
Tao Bao 30f2775b37 Merge "screen_ui: Drop the dependency on common.h." 
am: 738a4258d8

Change-Id: I337db6f14a9a7dd6394040026e004eec717cf487
 2018-05-02 14:41:24 -07:00
Tao Bao 738a4258d8 Merge "screen_ui: Drop the dependency on common.h." 2018-05-02 21:28:19 +00:00
Tao Bao 1d156b9882 screen_ui: Drop the dependency on common.h. 
Remove the use of fopen_path() in screen_ui.cpp, as this is the only
place that requires the dependency on common.h. The mounting work should
be done by the caller.

Also change the parameter in RecoveryUI::ShowFile() from const char* to
const std::string&.

Test: mmma -j bootable/recovery
Test: Build and boot into recovery image on angler. Choose 'View
      recovery logs'.
Change-Id: I8e63f14a8e2b12b856e5a92476e4226cd6ea39fb
 2018-05-02 12:46:21 -07:00
Zhomart Mukhamejanov da7e237596 updater_sample: Add streaming to PayloadSpec 
PayloadSpec
- add streaming generator and tests
- fix sample.json
- fix tests
- rename PackagePropertyFiles to PackageFiles, it has info
  not only about property files, and new name is shorter

Bug: 77148467
Test: `mmma -j bootable/recovery/updater_sample`
Change-Id: I9c1206c07c37183f13d3c25940f12981ca85b1b4
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
 2018-05-02 12:40:49 -07:00
Tao Bao 917111eb41 Merge "Add ScreenRecoveryUI::ShowMenu()." am: cac3ec3513 am: a2f44ebd09 
am: f0fd4f5983

Change-Id: Ifb6649be23644a366f2830ca50748b21d2ad92c1
 2018-05-01 13:48:38 -07:00
Tao Bao f0fd4f5983 Merge "Add ScreenRecoveryUI::ShowMenu()." am: cac3ec3513 
am: a2f44ebd09

Change-Id: Ifd9b438412fa2c2ca6d3bfcbfe3d620b15663070
 2018-05-01 13:46:04 -07:00
Tao Bao a2f44ebd09 Merge "Add ScreenRecoveryUI::ShowMenu()." 
am: cac3ec3513

Change-Id: Iaad9bc980d8db3a02dbae77af234cf1aefccdbd1
 2018-05-01 13:40:29 -07:00
Tao Bao cac3ec3513 Merge "Add ScreenRecoveryUI::ShowMenu()." 2018-05-01 20:32:37 +00:00