Commit Graph

5633 Commits

Author SHA1 Message Date
Tao Bao cbb044239a Merge "recovery: Remove obsolete code that supports "CACHE:foo" format."
am: 594dc4f5be

Change-Id: I290bcbe38e8aea9f296ddd0e0263e6e02cf92885
2016-12-10 20:54:31 +00:00
Tao Bao 594dc4f5be Merge "recovery: Remove obsolete code that supports "CACHE:foo" format." 2016-12-10 20:50:16 +00:00
Tao Bao f038ca00f4 recovery: Remove obsolete code that supports "CACHE:foo" format.
The passing of "--update_package=CACHE:foo" format has been removed
in Gingerbread, with commit 4baf641e7d96375eba3f9a3aff5400b9e3d28cd6
in frameworks/base (core/java/android/os/RecoverySystem.java).

Test: Recovery image with --update_package still works.
Change-Id: I37b56ccf98f62cadf2a3975bbc38b16fea6fe9a1
2016-12-10 09:29:16 -08:00
Tao Bao e743ce76f6 Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c am: d8ce8fa609
am: d0ecbfb729

Change-Id: Ib79be43f638a5389181bce5d983b2e406ed36511
2016-12-09 22:54:19 +00:00
Tao Bao d0ecbfb729 Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c
am: d8ce8fa609

Change-Id: Ia16ca3c82b3b7c5d88419a7719fce5355227958c
2016-12-09 22:48:48 +00:00
Tao Bao d8ce8fa609 Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d
am: f4fabe254c

Change-Id: I8cde0f335ff2c2a496f497d744ffc6a94ea832b7
2016-12-09 22:43:47 +00:00
Tao Bao f4fabe254c Merge "write_bootloader_message(<options>) should not reset stage field."
am: f28afc191d

Change-Id: I267a7130f70fef654e0cd5209d32ff4115250e45
2016-12-09 22:39:18 +00:00
Tao Bao f28afc191d Merge "write_bootloader_message(<options>) should not reset stage field." 2016-12-09 22:33:49 +00:00
Tao Bao 584d1f2422 Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 am: d4ceb1fb64
am: 3ab15c4dd8

Change-Id: Ia18dda35e4995596e9775a8a8ae65eeb20e74d6e
2016-12-09 20:19:40 +00:00
Tao Bao 3ab15c4dd8 Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109
am: d4ceb1fb64

Change-Id: I0be84193224de80faf8ca32b62bb75180fa03d1f
2016-12-09 20:04:39 +00:00
Tao Bao d4ceb1fb64 Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c
am: 6be6680109

Change-Id: I3cd516e8bb86f685143847e11624df4791183437
2016-12-09 19:59:09 +00:00
Tao Bao 6be6680109 Merge "recovery: Fix the argument parsing from COMMAND_FILE."
am: 332af25b7c

Change-Id: Ib7cdd050d4f20c61ac35c1fb1ad469c5b1c72262
2016-12-09 19:54:08 +00:00
Tao Bao 332af25b7c Merge "recovery: Fix the argument parsing from COMMAND_FILE." 2016-12-09 19:48:58 +00:00
Tao Bao 7d34fa17ab recovery: Fix the argument parsing from COMMAND_FILE.
Commit f0ed159f48 didn't ensure mounting
COMMAND_FILE (i.e. /cache) prior to reading. Also the first argument in
COMMAND_FILE should not be dropped (unlike the first "recovery" argument
in BCB message).

Bug: 33431888
Test: Push /cache/recovery/command and recovery imag parses the
      arguments successfully.

Change-Id: Ica3157a0bb03a2355315123354617eaf3fff15a4
2016-12-08 18:15:29 -08:00
Rahul Chaudhry 8b640ffabc bootable/recovery: cleanup compiler warnings (potential leak of memory)
bootable/recovery/applypatch/imgdiff.cpp:195:5: warning: Potential leak
of memory pointed to by 'img' [clang-analyzer-unix.Malloc]

Bug: 26936282
Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mm
Change-Id: Ie79c780233ddfebf85686a24df3bf2561f831580
2016-12-06 15:10:41 -08:00
Tao Bao e90c0598f6 Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 am: dd9c5674df
am: 93c92baa8e

Change-Id: I866f5d48224d004928c39e6fd75486db90fa5e1c
2016-12-05 23:45:47 +00:00
Tao Bao 93c92baa8e Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237
am: dd9c5674df

Change-Id: I1e3c26c8179cf6039d8ac801a9a4d6f6be59bbca
2016-12-05 23:42:15 +00:00
Tao Bao dd9c5674df Merge "recovery: Clean up get_args()." am: 3aadbbac39
am: c3ab25c237

Change-Id: I29a01238bba2cd35e48a03275e3ada4d4fee2888
2016-12-05 23:38:45 +00:00
Tao Bao c3ab25c237 Merge "recovery: Clean up get_args()."
am: 3aadbbac39

Change-Id: I8dd8003433ae2a33da51d69c25fe1b51628c8f97
2016-12-05 23:35:16 +00:00
Tao Bao 7e31f421a5 write_bootloader_message(<options>) should not reset stage field.
Commit bd56f1590c switches to calling
write_bootloader_message(<options>) in get_args(), which
unintentionally resets the stage field thus breaks two-step OTAs.

This CL changes write_bootloader_message(<options>) to only set the
command field (to "boot-recovery") and the recovery field (with the
specified options).

Test: Apply a two-step package.
Change-Id: I6905918812c7d3402cc1524688079066a4d22d29
2016-12-05 15:31:52 -08:00
Tao Bao 3aadbbac39 Merge "recovery: Clean up get_args()." 2016-12-05 23:28:36 +00:00
Tianjie Xu bc42603a8d Retry ioctl in uncrypt if it returns block# 0
In some conditions, ioctl(fd, FIBMAP, &block) returns block number 0.This
is a failure to locate the actual block number of the update package and
will result in an invalid block.map. This CL retries ioctl a few times
if it returns block number as 0.

Bug: 31632090
Test: On N9, uncrypt retries ioctl and produces the correct blockmap.
Change-Id: I913f98cf5c112915c2e803d0683db273c89053b6
2016-12-05 11:59:58 -08:00
Tao Bao f0ed159f48 recovery: Clean up get_args().
Test: Boot into new recovery image, verify the parsed parameters.
Change-Id: Ieefafb26cc4147ce4cb9ced4297cdb3b5d1d3789
2016-12-05 11:39:46 -08:00
Bill Yi 0622e407eb Revert "Import translations. DO NOT MERGE"
This reverts commit 6ecd63e459.

Change-Id: I66c34fc72c1e8f6a0c11e12fd7e21864f4437977
2016-12-05 18:46:14 +00:00
Bill Yi 6ecd63e459 Import translations. DO NOT MERGE
Change-Id: Ibe3698aabd36cca6e053ca099b87f09e8ad05c93
Auto-generated-cl: translation import
2016-12-02 23:55:11 -08:00
Tao Bao 02557cd6de Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b am: 997ccbc5a4
am: dd570b59ad

Change-Id: Idd86b944b6ce8577f992435853259badd90d5101
2016-12-02 06:00:25 +00:00
Tao Bao dd570b59ad Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b
am: 997ccbc5a4

Change-Id: Ic5a9d53af6e59c1e0ba16dd6275f941a21e4b98d
2016-12-02 05:52:55 +00:00
Tao Bao 997ccbc5a4 Merge "updater: Switch to libbase logging." am: d2c56629ab
am: 1d9779b57b

Change-Id: I92e782fc5b4df4a952f0759fb15f80754dce7802
2016-12-02 05:45:25 +00:00
Tao Bao 1d9779b57b Merge "updater: Switch to libbase logging."
am: d2c56629ab

Change-Id: Iadb27da225c4b0c7c6bc80d177d36bdf87296a5b
2016-12-02 05:37:54 +00:00
Tao Bao d2c56629ab Merge "updater: Switch to libbase logging." 2016-12-02 05:27:04 +00:00
Tao Bao 24e83404af Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162 am: bd8f34190c
am: 65383535a7

Change-Id: I792f9455b9ee89c3272b3cec52c1ca3146354280
2016-12-01 17:41:37 +00:00
Tao Bao 65383535a7 Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162
am: bd8f34190c

Change-Id: I8d5eb7a5abff461df9620bdef598797be0033f87
2016-12-01 17:36:08 +00:00
Tao Bao bd8f34190c Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8
am: 80cd188162

Change-Id: I14483f9a2272767d0f7fec426875b8dbb2fcd350
2016-12-01 17:30:38 +00:00
Tao Bao 80cd188162 Merge "bootable/recovery: cleanup compiler warnings (unused value)"
am: ef3bea15b8

Change-Id: I401597b9d7bad8a13c98093019cd6ad915d325f3
2016-12-01 17:25:37 +00:00
Tao Bao ef3bea15b8 Merge "bootable/recovery: cleanup compiler warnings (unused value)" 2016-12-01 17:03:13 +00:00
Tao Bao a7feeb4dce Merge "updater: Fix inconsistent code." 2016-12-01 16:52:12 +00:00
Tao Bao d0de070a39 updater: Fix inconsistent code.
Commit 81e54eddd4 introduced the
inconsistency when resolving the merge conflict into master.

Test: mmma bootable/recovery
Change-Id: I43b7ec76a7eee000708cdca60bd372173e1fac2f
2016-12-01 00:00:25 -08:00
Tao Bao 039f2da3e4 updater: Switch to libbase logging.
Test: Build an updater into a package and apply it on device.
Change-Id: I289b5768e9b1e44ef78e0479c64dbaa36fb1a685
2016-11-30 23:44:41 -08:00
Tao Bao 449467393a Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58 am: 83b649ee1d
am: 1bb63f0dc2

Change-Id: Idc9ae978354eb3376f69beb65c926a4d2365a4f9
2016-11-30 21:44:56 +00:00
Tao Bao 1bb63f0dc2 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58
am: 83b649ee1d

Change-Id: I785c6ec399ee2695af9276b47559f93d7d010a48
2016-11-30 21:39:24 +00:00
Tao Bao 83b649ee1d Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1
am: be54feda58

Change-Id: I2ba381a2c142df54122009bdcec539afca800824
2016-11-30 21:34:24 +00:00
Tao Bao be54feda58 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"
am: d255b661a1

Change-Id: I700b0591b9e67ff7932598da1e48c9fa793bb763
2016-11-30 21:30:01 +00:00
Tao Bao d255b661a1 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" 2016-11-30 21:19:42 +00:00
Connor O'Brien d514b61b31 Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35 am: 95beb966e2
am: 848519fcfa

Change-Id: I0ba4c571f91601227343ab9e8f7c8a232e75f9ef
2016-11-30 19:28:47 +00:00
Connor O'Brien 848519fcfa Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35
am: 95beb966e2

Change-Id: I55f81ecdf29f79736f111bd54b0e38e476a2e0c6
2016-11-30 19:23:16 +00:00
Rahul Chaudhry a793c58208 bootable/recovery: cleanup compiler warnings (unused value)
bootable/recovery/applypatch/imgdiff.cpp:322:11: warning: Value stored to 'ret' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
bootable/recovery/applypatch/imgdiff.cpp:447:11: warning: Value stored to 'ret' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
bootable/recovery/applypatch/imgdiff.cpp:553:3: warning: Value stored to 'ret' is never read [clang-analyzer-deadcode.DeadStores]

Bug: 26936282
Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mm
Change-Id: I3f865e3e9b9d19e5ea5e8dfd2fe2c644254ffbb5
2016-11-30 11:18:32 -08:00
Connor O'Brien 95beb966e2 Merge "Switch update verifier to HIDL HAL" am: 1528def46e
am: ae2463bb35

Change-Id: I92b714794116eb2bc07689995a9ac90932f2e30f
2016-11-30 19:17:46 +00:00
Connor O'Brien ae2463bb35 Merge "Switch update verifier to HIDL HAL"
am: 1528def46e

Change-Id: I77f12c0c865b04e191039de4b15482c02d5d5d9e
2016-11-30 19:12:14 +00:00
Connor O'Brien 1528def46e Merge "Switch update verifier to HIDL HAL" 2016-11-30 18:58:53 +00:00
Tim Kryger 48be23c8ed Remove outdated reference to icon_installing.png
The Wear recovery UI doesn't draw the installing icon but it was still
trying to open it.  Ever since these images were removed eight months
ago, this has resulted in an error printing to the screen at runtime.
Since the image wasn't really used, the lines to open it can simply be
removed.

Bug: 33203397
Change-Id: Id820f6d75e316c51d19b6095df407ecd61c0410e
2016-11-29 13:50:56 -08:00