Tao Bao
d9e440c967
Merge "otafault: Move headers under otafault/." am: 4289deaf82 am: 0018b93b27 am: 540c16307a
...
am: 5ae5a477b3
Change-Id: Ied39bb4a4f43dbbd98dd7e13427a820c2b7b08d1
2017-09-30 01:26:18 +00:00
Tianjie Xu
5d6a83a4d5
Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 am: 297a994416 am: 408ee90b58
...
am: a9d8f3f0f4
Change-Id: I6e3bb6029eb6413edee9b853a38d194c68a0310e
2017-09-30 01:25:44 +00:00
Tao Bao
5ae5a477b3
Merge "otafault: Move headers under otafault/." am: 4289deaf82 am: 0018b93b27
...
am: 540c16307a
Change-Id: I2cc0e38c036220452dbe92622f009bd7dbea406f
2017-09-30 01:13:53 +00:00
Tianjie Xu
a9d8f3f0f4
Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 am: 297a994416
...
am: 408ee90b58
Change-Id: Ic12c64792fca35d0ddb017a4016e3a17fa90a09d
2017-09-30 01:11:47 +00:00
Tao Bao
540c16307a
Merge "otafault: Move headers under otafault/." am: 4289deaf82
...
am: 0018b93b27
Change-Id: I4b0c15c957e324e290826167ee073d7a75f5476f
2017-09-29 19:40:42 +00:00
Tao Bao
0018b93b27
Merge "otafault: Move headers under otafault/."
...
am: 4289deaf82
Change-Id: Ia6d10a55a9a70205982c7ff442b24d07ed1697b6
2017-09-29 19:38:55 +00:00
Tao Bao
4289deaf82
Merge "otafault: Move headers under otafault/."
2017-09-29 19:30:16 +00:00
Tao Bao
381e715658
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e am: 8277230a98 am: d76a2e4c14
...
am: 7aa2fca9ef
Change-Id: I39f1f38096f0adf18ac391a29929bf85f5245706
2017-09-29 18:25:30 +00:00
Tao Bao
22101a05fd
Merge "otafault: Clean up header inclusion." am: d9373cf621 am: ffc171c56d am: f541841037
...
am: b5dfc86eaf
Change-Id: I71113ab38711362eef0187f567f213c4083588f2
2017-09-29 18:19:46 +00:00
Tao Bao
7aa2fca9ef
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e am: 8277230a98
...
am: d76a2e4c14
Change-Id: I7a97d1a8c4ace0d715381c4cedc03d53389198b6
2017-09-29 18:18:56 +00:00
Tao Bao
b5dfc86eaf
Merge "otafault: Clean up header inclusion." am: d9373cf621 am: ffc171c56d
...
am: f541841037
Change-Id: I971fa3c8d5b7d3546df65c1dda98b90c5530f704
2017-09-29 17:59:00 +00:00
Tianjie Xu
408ee90b58
Merge "Move the png open and destroy functions into a class" am: e687c5a1e1
...
am: 297a994416
Change-Id: Ic33be526b2bae0533d42477dfb618579f9e97035
2017-09-29 17:42:39 +00:00
Tianjie Xu
297a994416
Merge "Move the png open and destroy functions into a class"
...
am: e687c5a1e1
Change-Id: I826603e04c08408210ebfd197bba8d955b073d65
2017-09-29 17:39:56 +00:00
Tianjie Xu
e687c5a1e1
Merge "Move the png open and destroy functions into a class"
2017-09-29 17:34:20 +00:00
Tao Bao
d33b2f86b7
otafault: Move headers under otafault/.
...
Test: mmma bootable/recovery
Change-Id: I3ceb72f703c7c2857d656c137d71baa1fccd8238
2017-09-29 10:29:53 -07:00
Tao Bao
d76a2e4c14
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e
...
am: 8277230a98
Change-Id: Iff51b6e020288a56a4e9705b9511a646a8eb999c
2017-09-29 17:16:01 +00:00
Tao Bao
8277230a98
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."
...
am: 50f5a54a1e
Change-Id: I4f2d63757bb122cd027627321c1ab66c5e9284b6
2017-09-29 17:14:17 +00:00
Tao Bao
50f5a54a1e
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."
2017-09-29 17:08:01 +00:00
Tao Bao
f541841037
Merge "otafault: Clean up header inclusion." am: d9373cf621
...
am: ffc171c56d
Change-Id: Ib5d0676a143629c0151ad5e94052b67e2f626f49
2017-09-29 16:46:45 +00:00
Tao Bao
ffc171c56d
Merge "otafault: Clean up header inclusion."
...
am: d9373cf621
Change-Id: I1096e13532b7dbb6686479c8909a0252b31fc5f2
2017-09-29 16:37:32 +00:00
Tao Bao
d9373cf621
Merge "otafault: Clean up header inclusion."
2017-09-29 16:10:41 +00:00
Abhishek Arpure
5b1975b6cc
Merge "Integer overflow observed while formatting volume" am: 846f307c6f am: 4a20e8b68f am: 5f9defe3f2
...
am: ae30a316a1
Change-Id: I2fd6b0e9e844ef4b42a4d12c545c3c1f7b82893f
2017-09-29 10:59:38 +00:00
Tao Bao
d87d297b94
Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655 am: fdbe272dc0 am: 3421fa1815
...
am: 5eb45473bd
Change-Id: I4e9b5e8571d02cddb075138cae43532601bcbb10
2017-09-29 10:56:19 +00:00
Abhishek Arpure
ae30a316a1
Merge "Integer overflow observed while formatting volume" am: 846f307c6f am: 4a20e8b68f
...
am: 5f9defe3f2
Change-Id: I014df1d8e0a87ba4fab80b15d5602e3439372c55
2017-09-29 09:56:31 +00:00
Tao Bao
5eb45473bd
Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655 am: fdbe272dc0
...
am: 3421fa1815
Change-Id: I7d3db3624a3ed977d8c09f1090e1a26df066bf1b
2017-09-29 09:56:14 +00:00
Abhishek Arpure
5f9defe3f2
Merge "Integer overflow observed while formatting volume" am: 846f307c6f
...
am: 4a20e8b68f
Change-Id: Idbccd3323ddc9639094ed4c7f73ca6d4f917c9be
2017-09-29 05:34:15 +00:00
Abhishek Arpure
4a20e8b68f
Merge "Integer overflow observed while formatting volume"
...
am: 846f307c6f
Change-Id: I078b9079eb8f120780df2d38dabb663cef7a306b
2017-09-29 05:32:43 +00:00
Treehugger Robot
846f307c6f
Merge "Integer overflow observed while formatting volume"
2017-09-29 05:09:23 +00:00
Tao Bao
3421fa1815
Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655
...
am: fdbe272dc0
Change-Id: I344ef54db5949b853ad17a04ff88fd2254ac36bf
2017-09-29 04:41:55 +00:00
Tao Bao
646b05a66c
otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES.
...
Commit d80a99883d has explanation of
potential issues.
Test: mmma bootable/recovery
Change-Id: I25ca9920952b7bbdd8a661d9dc90962431410bc4
2017-09-28 18:25:10 -07:00
Tao Bao
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
Tao Bao
fdbe272dc0
Merge "roots: volume_for_path() parses and tries prefixes."
...
am: 3a1587f655
Change-Id: I8dbe9f7f1dca5e1f5d081854435f5ee069bab462
2017-09-28 23:05:35 +00:00
Tianjie Xu
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
Tao Bao
3a1587f655
Merge "roots: volume_for_path() parses and tries prefixes."
2017-09-28 21:12:53 +00:00
Tao Bao
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
Tianjie Xu
41eb05cf4f
Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca am: 8874d3c309 am: 5e969aa10d
...
am: 168a8d35c5
Change-Id: I46db96d43814880dfae20b38379724f8dea51452
2017-09-27 17:58:32 +00:00
Tianjie Xu
168a8d35c5
Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca am: 8874d3c309
...
am: 5e969aa10d
Change-Id: I59c1cee7aa7a67bd01d5c31c2af6e5390463c88e
2017-09-27 17:52:32 +00:00
Tianjie Xu
5e969aa10d
Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca
...
am: 8874d3c309
Change-Id: I678eb4f5e3ebee72f519bd0a9b3fd76cbcf18d7c
2017-09-27 17:49:17 +00:00
Tianjie Xu
8874d3c309
Merge "Add a new option in recovery menu to test the background texts"
...
am: 4c7608f3ca
Change-Id: I58dde37fe5c07487956c255b2d588d8505820fe9
2017-09-27 17:45:01 +00:00
Tianjie Xu
4c7608f3ca
Merge "Add a new option in recovery menu to test the background texts"
2017-09-27 17:39:05 +00:00
Tianjie Xu
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
Tao Bao
ff4c4e4839
Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac am: fccf3bc0cf am: 88fd6aff38
...
am: 4167aa25d6
Change-Id: If7c8e32c321fe0d20e063a0e4d93cb1b09226cef
2017-09-27 01:09:07 +00:00
Tao Bao
4167aa25d6
Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac am: fccf3bc0cf
...
am: 88fd6aff38
Change-Id: I268dbd09e13dce5920b5025a5cbf73b06b493668
2017-09-27 01:06:32 +00:00
Tao Bao
88fd6aff38
Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac
...
am: fccf3bc0cf
Change-Id: Ia081fa95df4fb5eebf17d984cd012f6bbde12e40
2017-09-27 01:03:52 +00:00
Tao Bao
fccf3bc0cf
Merge "clang-format: Remove the override of PenaltyExcessCharacter."
...
am: 151f0820ac
Change-Id: I6239cc5a76c39ae6f6e183000f4cab0573183be9
2017-09-27 01:01:34 +00:00
Tao Bao
151f0820ac
Merge "clang-format: Remove the override of PenaltyExcessCharacter."
2017-09-27 00:57:55 +00:00
Tianjie Xu
c3b71f2a28
Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841 am: eb5e194012 am: 448af2aa77
...
am: c7d2f69ba8
Change-Id: I4585ac319d12c5c99669c57cd71a0c1526496be4
2017-09-27 00:13:20 +00:00
Tianjie Xu
c7d2f69ba8
Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841 am: eb5e194012
...
am: 448af2aa77
Change-Id: I93d6154520ed3d42e85450e007fbd00afb9f54e7
2017-09-27 00:09:35 +00:00
Tianjie Xu
448af2aa77
Merge "Output split information for imgdiff when handling large apks" am: 7f54fe8841
...
am: eb5e194012
Change-Id: I6a9a4107fdc5a19941c4e506fd807a2b97bef3b0
2017-09-27 00:06:45 +00:00
Tianjie Xu
eb5e194012
Merge "Output split information for imgdiff when handling large apks"
...
am: 7f54fe8841
Change-Id: I97ad82d84b16b46e9c0c0f8198d3ab73d43031b0
2017-09-27 00:02:43 +00:00