845d91ca1a
Merge "roots: Remove #include "common.h"." am: e8ee697364 am: 0fa08924c6
...
am: 61ec157f7d
2017-10-02 18:06:25 +00:00
61ec157f7d
Merge "roots: Remove #include "common.h"." am: e8ee697364
...
am: 0fa08924c6
2017-10-02 17:58:24 +00:00
0fa08924c6
Merge "roots: Remove #include "common.h"."
...
am: e8ee697364
2017-10-02 17:55:13 +00:00
e8ee697364
Merge "roots: Remove #include "common.h"."
2017-10-02 17:44:27 +00:00
a2ecd59978
Merge "otafault: Move to soong." am: 475794a9af am: 2812e5d16b
...
am: 3af1827bb5
2017-09-30 01:14:15 +00:00
5ae5a477b3
Merge "otafault: Move headers under otafault/." am: 4289deaf82 am: 0018b93b27
...
am: 540c16307a
2017-09-30 01:13:53 +00:00
a9d8f3f0f4
Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 am: 297a994416
...
am: 408ee90b58
2017-09-30 01:11:47 +00:00
3af1827bb5
Merge "otafault: Move to soong." am: 475794a9af
...
am: 2812e5d16b
2017-09-29 21:15:50 +00:00
2812e5d16b
Merge "otafault: Move to soong."
...
am: 475794a9af
2017-09-29 21:14:31 +00:00
475794a9af
Merge "otafault: Move to soong."
2017-09-29 21:07:21 +00:00
540c16307a
Merge "otafault: Move headers under otafault/." am: 4289deaf82
...
am: 0018b93b27
2017-09-29 19:40:42 +00:00
0018b93b27
Merge "otafault: Move headers under otafault/."
...
am: 4289deaf82
2017-09-29 19:38:55 +00:00
4289deaf82
Merge "otafault: Move headers under otafault/."
2017-09-29 19:30:16 +00:00
7aa2fca9ef
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e am: 8277230a98
...
am: d76a2e4c14
2017-09-29 18:18:56 +00:00
a26e32d2a3
otafault: Move to soong.
...
Test: mmma bootable/recovery
Change-Id: I5f2520ea457ba66743aa3aa1d5b3b488a93084a3
2017-09-29 11:05:24 -07:00
ad774b2970
roots: Remove #include "common.h".
...
And add the missing include of <string.h> (e.g. for strcmp(3)).
Minor update to the arg of fs_mgr_get_entry_for_mount_point(), which now
accepts std::string.
Test: mmma bootable/recovery
Change-Id: I9cb8c31fe71b5a053f4d84bf1aba00e96c02ed03
2017-09-29 11:03:08 -07:00
b5dfc86eaf
Merge "otafault: Clean up header inclusion." am: d9373cf621 am: ffc171c56d
...
am: f541841037
2017-09-29 17:59:00 +00:00
408ee90b58
Merge "Move the png open and destroy functions into a class" am: e687c5a1e1
...
am: 297a994416
2017-09-29 17:42:39 +00:00
297a994416
Merge "Move the png open and destroy functions into a class"
...
am: e687c5a1e1
2017-09-29 17:39:56 +00:00
e687c5a1e1
Merge "Move the png open and destroy functions into a class"
2017-09-29 17:34:20 +00:00
d33b2f86b7
otafault: Move headers under otafault/.
...
Test: mmma bootable/recovery
Change-Id: I3ceb72f703c7c2857d656c137d71baa1fccd8238
2017-09-29 10:29:53 -07:00
d76a2e4c14
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e
...
am: 8277230a98
2017-09-29 17:16:01 +00:00
8277230a98
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."
...
am: 50f5a54a1e
2017-09-29 17:14:17 +00:00
50f5a54a1e
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."
2017-09-29 17:08:01 +00:00
f541841037
Merge "otafault: Clean up header inclusion." am: d9373cf621
...
am: ffc171c56d
2017-09-29 16:46:45 +00:00
ffc171c56d
Merge "otafault: Clean up header inclusion."
...
am: d9373cf621
2017-09-29 16:37:32 +00:00
d9373cf621
Merge "otafault: Clean up header inclusion."
2017-09-29 16:10:41 +00:00
ae30a316a1
Merge "Integer overflow observed while formatting volume" am: 846f307c6f am: 4a20e8b68f
...
am: 5f9defe3f2
2017-09-29 09:56:31 +00:00
5eb45473bd
Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655 am: fdbe272dc0
...
am: 3421fa1815
2017-09-29 09:56:14 +00:00
5f9defe3f2
Merge "Integer overflow observed while formatting volume" am: 846f307c6f
...
am: 4a20e8b68f
2017-09-29 05:34:15 +00:00
4a20e8b68f
Merge "Integer overflow observed while formatting volume"
...
am: 846f307c6f
2017-09-29 05:32:43 +00:00
846f307c6f
Merge "Integer overflow observed while formatting volume"
2017-09-29 05:09:23 +00:00
3421fa1815
Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655
...
am: fdbe272dc0
2017-09-29 04:41:55 +00:00
646b05a66c
otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES.
...
Commit d80a99883d
2017-09-28 18:25:10 -07:00
ac27a7a987
otafault: Clean up header inclusion.
...
Remove unneeded #includes. Also remove unneeded dependency on libz and
libselinux.
Test: mmma bootable/recovery
Change-Id: Ic8f7f46f4b89762dee384921504489de75320ac0
2017-09-28 18:25:04 -07:00
fdbe272dc0
Merge "roots: volume_for_path() parses and tries prefixes."
...
am: 3a1587f655
2017-09-28 23:05:35 +00:00
acba38c288
Move the png open and destroy functions into a class
...
The open_png() function used to open the png file but didn't close it;
and this caused the leak of fd. However, we cannot close the file inside
open_png() because the png file needs to remain open until the outer
function finishes parsing the file and destroys the png struct.
This CL addresses this issue by implementing a PngReader class to handle
the creation/destruction of the png struct.
Bug: 67010912
Test: Run graphic tests; also run locale tests and check fd.
Change-Id: I9a803b3cd8c16f16a9ffe8f0acc7fe0f42e95eb0
2017-09-28 15:29:37 -07:00
3a1587f655
Merge "roots: volume_for_path() parses and tries prefixes."
2017-09-28 21:12:53 +00:00
2dfc1a3898
roots: volume_for_path() parses and tries prefixes.
...
Commit cc323958f99e40fea06c511656c69c0b2e2d47f7 in system/core has
changed fs_mgr_get_entry_for_mount_point() to do an exact match only,
which breaks the behavior in volume_for_path().
This CL changes the volume_for_path() implementation to parse and pass
prefixes locally. For a given path like "/cache/recovery/last_log", it
will in turn attempt the prefixes of "/cache/recovery/last_log",
"/cache/recovery", "/cache", "/" and return the first hit.
Bug: 63912287
Test: Build and boot into recovery image on bullhead. 'View recovery
logs' works.
Change-Id: Ic8635b0939649dd5cc9ca501ebc3a2d1fbf5849d
2017-09-27 13:22:17 -07:00
168a8d35c5
Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca am: 8874d3c309
...
am: 5e969aa10d
2017-09-27 17:52:32 +00:00
5e969aa10d
Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca
...
am: 8874d3c309
2017-09-27 17:49:17 +00:00
8874d3c309
Merge "Add a new option in recovery menu to test the background texts"
...
am: 4c7608f3ca
2017-09-27 17:45:01 +00:00
4c7608f3ca
Merge "Add a new option in recovery menu to test the background texts"
2017-09-27 17:39:05 +00:00
29d5575fa8
Add a new option in recovery menu to test the background texts
...
Add a new option "Run locale test" to check the background text
images (i.e. texts for "erasing", "error", "no_command" and "installing"
with different locales.)
Use volume up/down button to cycle through all the locales embedded in
the png file, and power button to go back to recovery main menu.
Test: Run locale test with bullhead.
Change-Id: Ib16e119f372110cdb5e611ef497b0f9b9b418f51
2017-09-27 00:27:38 -07:00
4167aa25d6
Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac am: fccf3bc0cf
...
am: 88fd6aff38
2017-09-27 01:06:32 +00:00
88fd6aff38
Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac
...
am: fccf3bc0cf
2017-09-27 01:03:52 +00:00
fccf3bc0cf
Merge "clang-format: Remove the override of PenaltyExcessCharacter."
...
am: 151f0820ac
2017-09-27 01:01:34 +00:00
151f0820ac
Merge "clang-format: Remove the override of PenaltyExcessCharacter."
2017-09-27 00:57:55 +00:00
c7d2f69ba8
Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841 am: eb5e194012
...
am: 448af2aa77
2017-09-27 00:09:35 +00:00
448af2aa77
Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841
...
am: eb5e194012
2017-09-27 00:06:45 +00:00
Tao Bao
Tianjie Xu
Abhishek Arpure
Treehugger Robot