PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,159 Commits 1 Branch 0 Tags
deaf2662d7ba0ee4672d5cc2a4ff7a50108e8079
Commit Graph
7159 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Baoandandroid-build-merger deaf2662d7 Merge changes I69ce001a,I14514017,I8e67cda7 am: d2e1c0a981 am: 082adef0e0 
am: 492e87a40b

Change-Id: I451ae3ec1b79024ec083b190cc95791237382576
 2018-11-01 12:03:27 -07:00
Tao Baoandandroid-build-merger 492e87a40b Merge changes I69ce001a,I14514017,I8e67cda7 am: d2e1c0a981 
am: 082adef0e0

Change-Id: I48425fa094de82a02d91172468b7415504faf72c
 2018-11-01 11:59:30 -07:00
Tao Baoandandroid-build-merger 082adef0e0 Merge changes I69ce001a,I14514017,I8e67cda7 
am: d2e1c0a981

Change-Id: I65d3bb9a16efa3f983872a9982481d4947b5f6c7
 2018-11-01 11:53:30 -07:00
Tao BaoandGerrit Code Review d2e1c0a981 Merge changes I69ce001a,I14514017,I8e67cda7 
* changes:
  minui: Remove the default and copy ctors for GRSurface.
  minui: Refactor GRSurfaceAdf.
  minui: Refactor GRSurfaceFbdev.
 2018-11-01 18:37:33 +00:00
Tianjie Xuandandroid-build-merger 23354167e8 Merge "Refactor the code to check the metadata" am: cbdcfc0038 am: 6ba8eb5248 
am: ed7cbc2200

Change-Id: I0e0a62a123f0d391a2b3a7e88d5e119074ea3405
 2018-11-01 10:50:13 -07:00
Tianjie Xuandandroid-build-merger ed7cbc2200 Merge "Refactor the code to check the metadata" am: cbdcfc0038 
am: 6ba8eb5248

Change-Id: I3a1a4c25e8ed9c7fb771a69577cf1bd226ea1d19
 2018-11-01 10:45:08 -07:00
Tianjie Xuandandroid-build-merger 6ba8eb5248 Merge "Refactor the code to check the metadata" 
am: cbdcfc0038

Change-Id: I0b7d8a94a1e3d107a9e503c48363344209483b94
 2018-11-01 10:41:04 -07:00
Tao Baoandandroid-build-merger e601ca2db8 Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest." am: 4ba20f1031 am: 9533329773 
am: f3db36e0af

Change-Id: Id1690497e2f8422ca1f6c9a4d98ad0554aff188e
 2018-11-01 10:41:03 -07:00
Tianjie XuandGerrit Code Review cbdcfc0038 Merge "Refactor the code to check the metadata" 2018-11-01 17:38:18 +00:00
Tao Baoandandroid-build-merger f3db36e0af Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest." am: 4ba20f1031 
am: 9533329773

Change-Id: Ifa6717fb8ecee65554e7af27c13f8aeef3bb002c
 2018-11-01 10:32:58 -07:00
Tao Baoandandroid-build-merger 9533329773 Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest." 
am: 4ba20f1031

Change-Id: Iac05758ba00aa6fb05d18427642d198e602be7b3
 2018-11-01 10:28:56 -07:00
Tao BaoandGerrit Code Review 4ba20f1031 Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest." 2018-11-01 17:19:16 +00:00
Tao Bao 929e481e71 tests: Use FRIEND_TEST in ScreenRecoveryUITest. 
Test: Run recovery_unit_test on marlin.
Change-Id: I93ec6df8c056b2c485200822f18db0b852595242
 2018-10-31 23:09:49 -07:00
Tao Baoandandroid-build-merger fa13898752 Merge "minui: Add a protected GRSurface ctor." am: 287d5dc618 am: 6e0ce63c4b 
am: 60965c1537

Change-Id: I0c990ec1373220fb221d50ac9fba98d7aaf81e15
 2018-10-31 20:37:38 -07:00
Tao Baoandandroid-build-merger 60965c1537 Merge "minui: Add a protected GRSurface ctor." am: 287d5dc618 
am: 6e0ce63c4b

Change-Id: I5196faa651a60319b292e4ba10283a6b3222b82b
 2018-10-31 20:33:09 -07:00
Tao Baoandandroid-build-merger 6e0ce63c4b Merge "minui: Add a protected GRSurface ctor." 
am: 287d5dc618

Change-Id: I6abee6e2e1654eb5406fcb41b6daee6d314c898a
 2018-10-31 20:28:35 -07:00
Tao Bao 710bc535f4 minui: Remove the default and copy ctors for GRSurface. 
As well as all the derived classes. Instances must be created with
Create(). A default copy ctor would mess up the ownership of the
mapped or allocated buffer in these classes, so that has been explicitly
removed.

Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin.
Test: `Run graphics test` on blueline.
Change-Id: I69ce001a9ec9e3ac851edb6ec4d3fa11f4aaea08
 2018-10-31 20:28:29 -07:00
Tao Bao 1b18cf56e2 minui: Refactor GRSurfaceAdf. 
Test: mmma -j bootable/recovery
Change-Id: I14514017aace4b7043a9db1f5a93ec130a6f89c4
 2018-10-31 20:28:29 -07:00
Tao Bao 4a22b28bea minui: Refactor GRSurfaceFbdev. 
- Adds Create() that returns a GRSurfaceFbdev instance.
- Moves away from using the copy ctor (precisely assignment operator) of
  GRSurfaceFbdev.
- Moves the GRSurfaceFbdev deallocation code into GRSurfaceFbdev's dtor.
- Manages MinuiBackendFbdev::gr_framebuffer with std::unique_ptr.

Test: mmma -j bootable/recovery
Test: `Run graphics test` on taimen.
Change-Id: I8e67cda7bc3a2feec0790124d035caa36fb58a89
 2018-10-31 20:28:29 -07:00
Tao BaoandGerrit Code Review 287d5dc618 Merge "minui: Add a protected GRSurface ctor." 2018-11-01 03:18:41 +00:00
David Andersonandandroid-build-merger 1f9cf242ab Merge "recovery: Fix mounting /system with dynamic partitions." am: 023807fcf7 am: e3f6814451 
am: fd23585aa5

Change-Id: Icc0f888be17e0eb1d3d88928b92a9b327b4cabb1
 2018-10-31 14:48:28 -07:00
David Andersonandandroid-build-merger fd23585aa5 Merge "recovery: Fix mounting /system with dynamic partitions." am: 023807fcf7 
am: e3f6814451

Change-Id: I90b1fba26ecfb0a6405a0e80291ce7a7b05d1ad5
 2018-10-31 14:31:59 -07:00
David Andersonandandroid-build-merger e3f6814451 Merge "recovery: Fix mounting /system with dynamic partitions." 
am: 023807fcf7

Change-Id: I6c73435e685a94ab36e872c6abd479ece3ca1af9
 2018-10-31 13:50:17 -07:00
David AndersonandGerrit Code Review 023807fcf7 Merge "recovery: Fix mounting /system with dynamic partitions." 2018-10-31 20:38:46 +00:00
Tao Bao 44820ac1e3 minui: Add a protected GRSurface ctor. 
This prepares for the removal of the default and copy ctors, by making
GRSurface::Create() as the only way to get GRSurface instances.

Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin.
Change-Id: I0c34c3f3967e252deb020907c83acbac8a8f36b9
 2018-10-31 11:19:28 -07:00
Tianjie Xu 93b5bf261c Refactor the code to check the metadata 
The two functions check_wipe_package() and check_newer_ab_build() were
using the same flow; and checked the same device properties against the
metadata file in the package. These properties include: ota_type,
pre-device, and serial number.

Therefore, we can consolidate the checks to a single function; and
continue to check the fingerprint and timestamp only for AB updates.

This change also addresses the need to accept multiple serial number in
the wipe package.

Bug: 118401208
Test: unit tests pass
Change-Id: Ia6bc48fb6effcae059a2ff2cf71764b4136b4c00
 2018-10-31 11:03:58 -07:00
Bill Yi df115ad537 Import translations. DO NOT MERGE 
Change-Id: Icfe0dc21567e74da70cc7b2f1229815bceeac958
Auto-generated-cl: translation import
 2018-10-30 19:01:50 -07:00
David Anderson 2b2f423ef6 recovery: Fix mounting /system with dynamic partitions. 
When using dynamic partitions, the blk_device field in fstab_rec must be
translated to a /dev/block/dm-N node with
fs_mgr_update_logical_partition. However, init will not have created
these nodes to begin with since CreateLogicalPartitions is not called in
recovery. This patch addresses both issues.

Note that flashing system through fastbootd will not work while /system is
mounted.

Bug: 118634720
Test: manual test
Change-Id: I06c83309d09eab6b65245b1ed10c51d05398f23e
 2018-10-30 13:47:59 -07:00
Tianjie Xuandandroid-build-merger 3dc4ccbdea Merge "Add description for the new translation" am: d84d570d8c am: 3616e28bd1 
am: fe93cdf6ef

Change-Id: I893ab7db1544878fa3e3e5c3bc2a8428bb476beb
 2018-10-29 20:15:50 -07:00
Tianjie Xuandandroid-build-merger fe93cdf6ef Merge "Add description for the new translation" am: d84d570d8c 
am: 3616e28bd1

Change-Id: I2dbd86a58ec2a0860e4730b90f5cac3b464e75cc
 2018-10-29 20:11:48 -07:00
Tianjie Xuandandroid-build-merger 3616e28bd1 Merge "Add description for the new translation" 
am: d84d570d8c

Change-Id: Ifce87eca5a4d76d600eb9dd22ec0c805a1a3b37d
 2018-10-29 20:07:43 -07:00
Tianjie XuandGerrit Code Review d84d570d8c Merge "Add description for the new translation" 2018-10-30 03:00:47 +00:00
Tianjie Xuandandroid-build-merger 4b6e26aa5f Merge "Switch to use commandline parser" am: fd27983b62 am: 188b4ec273 
am: 0894b5d0bf

Change-Id: Ib8ea5db8384d0c186f6c73a860858177ddc804be
 2018-10-29 15:39:33 -07:00
Tianjie Xuandandroid-build-merger 0894b5d0bf Merge "Switch to use commandline parser" am: fd27983b62 
am: 188b4ec273

Change-Id: I29a73a007ea5cc75333b0733b71b71cddb0e029d
 2018-10-29 15:35:33 -07:00
Tianjie Xuandandroid-build-merger 188b4ec273 Merge "Switch to use commandline parser" 
am: fd27983b62

Change-Id: Ifb55a4e75ae7b13233af160f8ea85ceeac1527f3
 2018-10-29 15:31:23 -07:00
Tianjie XuandGerrit Code Review fd27983b62 Merge "Switch to use commandline parser" 2018-10-29 22:23:31 +00:00
Tianjie Xuandandroid-build-merger 341df2c533 Merge "Clean up the zipfile creation in InstallTest" am: 41cb6a65ac am: 078034d300 
am: d791648e90

Change-Id: Ife1196b6cb7c7b9f395c81929b57b31db78fd026
 2018-10-29 15:13:25 -07:00
Tianjie Xuandandroid-build-merger d791648e90 Merge "Clean up the zipfile creation in InstallTest" am: 41cb6a65ac 
am: 078034d300

Change-Id: I813e1b3f3b84171cf0e138a40ea3b6f803b3165f
 2018-10-29 15:09:20 -07:00
Tianjie Xuandandroid-build-merger 078034d300 Merge "Clean up the zipfile creation in InstallTest" 
am: 41cb6a65ac

Change-Id: I71df7a03a79b36d003b6fa888e8c0ab5f26aaedc
 2018-10-29 15:06:17 -07:00
Tianjie XuandGerrit Code Review 41cb6a65ac Merge "Clean up the zipfile creation in InstallTest" 2018-10-29 21:54:25 +00:00
Tianjie Xu 9f843e7751 Add description for the new translation 
As we localize the wipe data menu under the recovery mode, some
additional strings need the new translation. The strings include
1. The menu header that prompts a data wipe
2. Try again description
3. Factory reset description
4. The menu header to confirm a data wipe
5. Cancel description

We will resue the "Factory reset description" in the confirmation menu;
and the image_generator tool will be moved to this directory in later
cls.

Bug: 74397117
Test: mma
Change-Id: I706b8677dba506b62e890f6b200e3eb3b11ce483
 2018-10-29 14:43:44 -07:00
Tianjie Xu f2fb49a3c4 Clean up the zipfile creation in InstallTest 
Consolidate them into a static function.

Test: unit tests pass
Change-Id: If05b62215940b221fc499d779eedc5079f68a060
 2018-10-29 12:04:13 -07:00
Tianjie Xu edfeb97f9f Switch to use commandline parser 
The commandline parser adds some flexibility to the argument parsing. It
also makes the help message more descriptive.

Bug: 74397117
Test: generate a image, checks the help message
Change-Id: Ib238658a9a6fa8806f1b0dde419c8fb970e7cb37
 2018-10-29 11:01:36 -07:00
Tianjie Xuandandroid-build-merger 8787d4a1c8 Merge "Remove the load_keys function" am: 64ceace44f am: ac9d4ae1bf 
am: 23b832fd1d

Change-Id: Ie9c793059b6e6763dd9af014624222b3faaf0e5b
 2018-10-25 10:45:05 -07:00
Tianjie Xuandandroid-build-merger 23b832fd1d Merge "Remove the load_keys function" am: 64ceace44f 
am: ac9d4ae1bf

Change-Id: I20cf75d7b357466650d0fce4efeb91f0fe2176e8
 2018-10-25 10:40:28 -07:00
Tianjie Xuandandroid-build-merger ac9d4ae1bf Merge "Remove the load_keys function" 
am: 64ceace44f

Change-Id: I237dfde12e8597c36463ca31e487bf36b0d13ea1
 2018-10-25 10:35:30 -07:00
Tianjie XuandGerrit Code Review 64ceace44f Merge "Remove the load_keys function" 2018-10-25 17:25:49 +00:00
Tianjie Xuandandroid-build-merger 858fe12f39 Merge "Add sanity check when loading public keys for OTA package" am: 6793f61795 am: accb42d1b3 
am: aa7d7f122a

Change-Id: I52cc32ffa3b6990f19e00e15cc9c7fc600b905ff
 2018-10-24 21:22:35 -07:00
Tianjie Xuandandroid-build-merger aa7d7f122a Merge "Add sanity check when loading public keys for OTA package" am: 6793f61795 
am: accb42d1b3

Change-Id: I7d66b01eeb8c25339c323d306fc7b8fc4980f9c9
 2018-10-24 21:18:29 -07:00
Tianjie Xuandandroid-build-merger accb42d1b3 Merge "Add sanity check when loading public keys for OTA package" 
am: 6793f61795

Change-Id: I28ee367d213c619bebce0c5e138aa426c41b92df
 2018-10-24 21:14:25 -07:00