Commit Graph

7296 Commits

Author SHA1 Message Date
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
android-build-team Robot 327dd7875e release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-4367572 snap-temp-L13500000107248413
Change-Id: Ief86293cfc186b34cc3d7628637bb83e8dadfe57
2017-09-29 08:44:09 +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
Luke Song 846012fc44 graphics: add rotation logic
Bug: 65556996
Bug: 63541890
Test: Tried 4 rotations, viewed logs and graphics test
Change-Id: I2a6c18c28df03f0461663f63bf16db32c45211ec
2017-09-28 14:11:35 -07: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
android-build-team Robot 770935d1c5 release-request-ccf2fffc-f042-4ff3-9aa0-53d7f927fbf8-for-git_pi-release-4362679 snap-temp-L24900000106498589
Change-Id: I2f093db3cdc7dadfedbad5b3da5c3df64dd18a71
2017-09-27 08:08:40 +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
Tianjie Xu 7f54fe8841 Merge "Output split information for imgdiff when handling large apks" 2017-09-26 23:57:40 +00:00
Tao Bao a1f6980af7 clang-format: Remove the override of PenaltyExcessCharacter.
So it falls back (from 32) to the default value in Google style:
PenaltyExcessCharacter: 1000000

This way it no longer allows lines exceeding the 100-char limit.

const char* x[] = { "long enough so that the line has 101 chars", nullptr };

  would become

const char* x[] = { "long enough so that the line has 101 chars",
                    nullptr };

Test: clang-format the line above.
Change-Id: If578dbdae55d6d81f5e47889890e2afa12b4199a
2017-09-26 15:07:45 -07:00
android-build-team Robot 9544ae4c59 release-request-ed8626b9-4479-4c76-9207-5f511f136606-for-git_pi-release-4354758 snap-temp-L65900000105223161
Change-Id: I9896072a01b263275cfef0fa50b7a4c8fc13f0be
2017-09-22 08:08:44 +00:00
Tianjie Xu 7bdb1745ac Merge "update the recovery background image with new translation" am: c0123e0c3a am: 6a5204ac8d am: 9425dba5b3
am: d82af7d280

Change-Id: Ib7940fd0ab701235d178c2e6f11b34037db9b444
2017-09-21 22:31:12 +00:00
Tianjie Xu d82af7d280 Merge "update the recovery background image with new translation" am: c0123e0c3a am: 6a5204ac8d
am: 9425dba5b3

Change-Id: I580b4c95e20493484cb039f9421abe8f22b4301f
2017-09-21 22:20:39 +00:00
Tianjie Xu 9425dba5b3 Merge "update the recovery background image with new translation" am: c0123e0c3a
am: 6a5204ac8d

Change-Id: I1ca72cab196f5c37f792d3728acfebdf4a781058
2017-09-21 22:12:02 +00:00
Tianjie Xu 6a5204ac8d Merge "update the recovery background image with new translation"
am: c0123e0c3a

Change-Id: I071133d52c92b7166df12313c7298621a6718eaa
2017-09-21 22:09:58 +00:00
Tianjie Xu c0123e0c3a Merge "update the recovery background image with new translation" 2017-09-21 22:05:29 +00:00
Tianjie Xu 82582b4562 Output split information for imgdiff when handling large apks
Add a mandatory option in imgdiff to write the split info (i.e.
patch_size, tgt_size, src_ranges) to file when handling large apks.
Therefore, the caller of imgdiff can create split transfers based on
the info.

Bug: 63542719
Test: unit tests pass
Change-Id: I853d55d1f999fd576474faa81077f7307f4d856d
2017-09-21 11:42:16 -07:00
Tianjie Xu 4a47a3e41f update the recovery background image with new translation
Test: recovery manual test && run graphic test under recovery
Change-Id: I2bc514a07a12276f42adb1eec5e208190b4602f2
2017-09-19 23:36:28 -07:00
android-build-team Robot a1007d4dd5 release-request-849a3dc3-db53-4e70-9b7a-92295133ddeb-for-git_pi-release-4346747 snap-temp-L27900000104043986
Change-Id: I390c91bec575ce904426f30f062ff2b67f72ce6e
2017-09-19 08:08:17 +00:00
Mark Salyzyn 5e7697a459 Merge "recovery: reduce overall boot time" am: a815d3fb59 am: 9da4179ee6 am: 4b8bbb95ab
am: ca93a1f529

Change-Id: I77778787a3907460bcda2b1b502a12e3ff258aff
2017-09-18 23:50:47 +00:00
Mark Salyzyn ca93a1f529 Merge "recovery: reduce overall boot time" am: a815d3fb59 am: 9da4179ee6
am: 4b8bbb95ab

Change-Id: I127bb24963d2500dbdfbca933c40001017b8b42a
2017-09-18 23:48:47 +00:00
Mark Salyzyn 4b8bbb95ab Merge "recovery: reduce overall boot time" am: a815d3fb59
am: 9da4179ee6

Change-Id: I03c6ce2eabb113534a57ba777360eb8d16a7a47b
2017-09-18 23:46:16 +00:00
Mark Salyzyn 9da4179ee6 Merge "recovery: reduce overall boot time"
am: a815d3fb59

Change-Id: I430edd95601b47d09861e289e0de51ff1bc32fdd
2017-09-18 23:44:20 +00:00
Treehugger Robot a815d3fb59 Merge "recovery: reduce overall boot time" 2017-09-18 23:37:59 +00:00