Commit Graph

5185 Commits

Author SHA1 Message Date
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
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 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 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
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 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 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 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
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
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
Mark Salyzyn 61744b95d0 recovery: reduce overall boot time
Move recovery-refresh and recovery-persist to onshot exec_background.
synchronous exec commands impact boot time.

Test: none
Bug: 65736247
Change-Id: Ic065c27b21f9bacbadee1e8c07bb15e2c41e0082
2017-09-18 13:55:32 -07:00
Tianjie Xu f358a7d12b Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307 am: 2cb1fb45c0
am: ed50c1817f

Change-Id: Ia8012462d20f8b6ba15b12caf9b4e9be43bb2a47
2017-09-17 21:48:24 +00:00
Tianjie Xu ed50c1817f Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307
am: 2cb1fb45c0

Change-Id: Ia4d4dd1f1f0e2667d0b4bbe06c76d20663ce580f
2017-09-17 21:45:23 +00:00
Tianjie Xu 2cb1fb45c0 Merge "Fix the dangling pointer when setting up arguments of imgdiff"
am: ca5a071307

Change-Id: I9411f0bce8d96c598db365d0257d4c9893e24104
2017-09-17 21:42:23 +00:00
Tianjie Xu ca5a071307 Merge "Fix the dangling pointer when setting up arguments of imgdiff" 2017-09-17 21:39:09 +00:00
Bill Yi 365e023539 Import translations. DO NOT MERGE
am: c9b0416842  -s ours

Change-Id: Iff8a53fb5034b4c1829ccfa045015f9f45241e2d
2017-09-16 19:30:17 +00:00
Bill Yi c9b0416842 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ia05d14ff5b7f6b283f46566c88a4edc4a89d5576
2017-09-16 05:39:19 -07:00
Tao Bao 2010f84297 Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b am: ad878d5494
am: 34e7d45fb3

Change-Id: Ia987a7abbb9385cec1797718593b4e1c1c6be6a3
2017-09-13 22:35:47 +00:00
Tao Bao 34e7d45fb3 Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b
am: ad878d5494

Change-Id: I26f95122637228debd396ad07928273e1f776da1
2017-09-13 21:57:04 +00:00
Tao Bao ad878d5494 Merge "Remove EXPAND/STRINGIFY macros."
am: 6e7df82c7b

Change-Id: Id3bf3e77e54c90739cf716029928197c3274632f
2017-09-13 21:40:03 +00:00
Tianjie Xu 8ba7c45e0b Fix the dangling pointer when setting up arguments of imgdiff
Test: unit tests pass
Change-Id: If884e805ccd4df73671ab3436eb90860786ff6c9
2017-09-13 14:05:42 -07:00
Tao Bao 6e7df82c7b Merge "Remove EXPAND/STRINGIFY macros." 2017-09-13 20:53:53 +00:00