6f94208430
Snap for 5110273 from 9b21c7df08 to qt-release
...
Change-Id: Ifb0d4c2fc75603a97f4b95d808bc7ac450e32f61
2018-11-04 03:08:47 +00:00
9b21c7df08
Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev." am: f2a9152408 am: f0cf952082
...
am: adbdb9ee25
2018-11-02 15:31:28 -07:00
adbdb9ee25
Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev." am: f2a9152408
...
am: f0cf952082
2018-11-02 15:26:24 -07:00
f0cf952082
Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev."
...
am: f2a9152408
2018-11-02 15:17:20 -07:00
f2a9152408
Merge "minui: Use android::base::unique_fd in MinuiBackendFbdev."
2018-11-02 22:09:39 +00:00
f65d48bb5a
minui: Use android::base::unique_fd in MinuiBackendFbdev.
...
Test: mmma -j bootable/recovery
Test: `Run graphics test` on taimen.
Change-Id: I5b25cafbd0107943606a87f0619242cf950174ac
2018-11-02 09:35:08 -07:00
35b01a2023
Merge "minui: Add GRSurface::Clone()." am: 948790fa4c am: 24b89ffd25
...
am: 7c103b8846
2018-11-01 19:43:59 -07:00
7c103b8846
Merge "minui: Add GRSurface::Clone()." am: 948790fa4c
...
am: 24b89ffd25
2018-11-01 19:39:57 -07:00
24b89ffd25
Merge "minui: Add GRSurface::Clone()."
...
am: 948790fa4c
2018-11-01 19:34:50 -07:00
948790fa4c
Merge "minui: Add GRSurface::Clone()."
2018-11-02 02:11:10 +00:00
63b59dcead
minui: Add GRSurface::Clone().
...
Clone() allows duplicating the image that's stored in the GRSurface.
Test: Run recovery_unit_test.
Change-Id: Ia50d507c6200f2de5f17143775de805247a60e1f
2018-11-01 12:14:46 -07:00
deaf2662d7
Merge changes I69ce001a,I14514017,I8e67cda7 am: d2e1c0a981 am: 082adef0e0
...
am: 492e87a40b
2018-11-01 12:03:27 -07:00
492e87a40b
Merge changes I69ce001a,I14514017,I8e67cda7 am: d2e1c0a981
...
am: 082adef0e0
2018-11-01 11:59:30 -07:00
082adef0e0
Merge changes I69ce001a,I14514017,I8e67cda7
...
am: d2e1c0a981
2018-11-01 11:53:30 -07:00
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
23354167e8
Merge "Refactor the code to check the metadata" am: cbdcfc0038 am: 6ba8eb5248
...
am: ed7cbc2200
2018-11-01 10:50:13 -07:00
ed7cbc2200
Merge "Refactor the code to check the metadata" am: cbdcfc0038
...
am: 6ba8eb5248
2018-11-01 10:45:08 -07:00
6ba8eb5248
Merge "Refactor the code to check the metadata"
...
am: cbdcfc0038
2018-11-01 10:41:04 -07:00
e601ca2db8
Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest." am: 4ba20f1031 am: 9533329773
...
am: f3db36e0af
2018-11-01 10:41:03 -07:00
cbdcfc0038
Merge "Refactor the code to check the metadata"
2018-11-01 17:38:18 +00:00
f3db36e0af
Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest." am: 4ba20f1031
...
am: 9533329773
2018-11-01 10:32:58 -07:00
9533329773
Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest."
...
am: 4ba20f1031
2018-11-01 10:28:56 -07:00
4ba20f1031
Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest."
2018-11-01 17:19:16 +00:00
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
fa13898752
Merge "minui: Add a protected GRSurface ctor." am: 287d5dc618 am: 6e0ce63c4b
...
am: 60965c1537
2018-10-31 20:37:38 -07:00
60965c1537
Merge "minui: Add a protected GRSurface ctor." am: 287d5dc618
...
am: 6e0ce63c4b
2018-10-31 20:33:09 -07:00
6e0ce63c4b
Merge "minui: Add a protected GRSurface ctor."
...
am: 287d5dc618
2018-10-31 20:28:35 -07:00
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
1b18cf56e2
minui: Refactor GRSurfaceAdf.
...
Test: mmma -j bootable/recovery
Change-Id: I14514017aace4b7043a9db1f5a93ec130a6f89c4
2018-10-31 20:28:29 -07:00
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
287d5dc618
Merge "minui: Add a protected GRSurface ctor."
2018-11-01 03:18:41 +00:00
3bcfb8f14e
Snap for 5103990 from 1f9cf242ab to qt-release
...
Change-Id: I39448cd6275e63abae7dc46c0c7099fcd70d0b47
2018-11-01 03:05:02 +00:00
1f9cf242ab
Merge "recovery: Fix mounting /system with dynamic partitions." am: 023807fcf7 am: e3f6814451
...
am: fd23585aa5
2018-10-31 14:48:28 -07:00
fd23585aa5
Merge "recovery: Fix mounting /system with dynamic partitions." am: 023807fcf7
...
am: e3f6814451
2018-10-31 14:31:59 -07:00
e3f6814451
Merge "recovery: Fix mounting /system with dynamic partitions."
...
am: 023807fcf7
2018-10-31 13:50:17 -07:00
023807fcf7
Merge "recovery: Fix mounting /system with dynamic partitions."
2018-10-31 20:38:46 +00:00
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
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
18f3f571d7
Snap for 5101359 from 3dc4ccbdea to qt-release
...
Change-Id: Iecb0859090269e7b04c166752dc2da536f8ec41b
2018-10-31 03:08:49 +00:00
df115ad537
Import translations. DO NOT MERGE
...
Change-Id: Icfe0dc21567e74da70cc7b2f1229815bceeac958
Auto-generated-cl: translation import
2018-10-30 19:01:50 -07:00
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
3dc4ccbdea
Merge "Add description for the new translation" am: d84d570d8c am: 3616e28bd1
...
am: fe93cdf6ef
2018-10-29 20:15:50 -07:00
fe93cdf6ef
Merge "Add description for the new translation" am: d84d570d8c
...
am: 3616e28bd1
2018-10-29 20:11:48 -07:00
55aa8b7cdd
Snap for 5098750 from 4b6e26aa5f to qt-release
...
Change-Id: I27ba52738e5b8b1a370d69aa9dab4e1c691c1e25
2018-10-30 03:10:08 +00:00
3616e28bd1
Merge "Add description for the new translation"
...
am: d84d570d8c
2018-10-29 20:07:43 -07:00
d84d570d8c
Merge "Add description for the new translation"
2018-10-30 03:00:47 +00:00
4b6e26aa5f
Merge "Switch to use commandline parser" am: fd27983b62 am: 188b4ec273
...
am: 0894b5d0bf
2018-10-29 15:39:33 -07:00
0894b5d0bf
Merge "Switch to use commandline parser" am: fd27983b62
...
am: 188b4ec273
2018-10-29 15:35:33 -07:00
188b4ec273
Merge "Switch to use commandline parser"
...
am: fd27983b62
2018-10-29 15:31:23 -07:00
fd27983b62
Merge "Switch to use commandline parser"
2018-10-29 22:23:31 +00:00
android-build-team Robot
Tao Bao
Treehugger Robot
Tianjie Xu
David Anderson
Bill Yi