Commit Graph

7159 Commits

Author SHA1 Message Date
Jaegeuk Kim a296fea692 Merge "add sload.f2fs for recovery format" am: 4eaf7a157d am: 3d4359d3ae
am: adb8f660a2

Change-Id: I551f6fe2e040720ea02cbdacfc73bc3aaa5b2e3d
2017-12-08 17:00:50 +00:00
Jaegeuk Kim adb8f660a2 Merge "add sload.f2fs for recovery format" am: 4eaf7a157d
am: 3d4359d3ae

Change-Id: I4098c81a3c5cef921463c6b7512113961034f81b
2017-12-08 01:13:13 +00:00
Jaegeuk Kim 3d4359d3ae Merge "add sload.f2fs for recovery format"
am: 4eaf7a157d

Change-Id: I44f158c95501e37088dbd05d006614bb2799d491
2017-12-08 01:07:11 +00:00
Elliott Hughes 38b4f74b5d Merge "Add a /bin symlink for consistency." am: ed369101ba am: 13b751ed84
am: 669f9b0cbf

Change-Id: I5587974efae8d33067896becf687f59468a570df
2017-12-08 00:58:01 +00:00
Jaegeuk Kim 4eaf7a157d Merge "add sload.f2fs for recovery format" 2017-12-08 00:57:41 +00:00
Elliott Hughes 669f9b0cbf Merge "Add a /bin symlink for consistency." am: ed369101ba
am: 13b751ed84

Change-Id: I144d599f1ba418079675f9a8d5a0812912228819
2017-12-07 18:49:47 +00:00
Elliott Hughes 13b751ed84 Merge "Add a /bin symlink for consistency."
am: ed369101ba

Change-Id: Iac7a3234333f46aaba83b47f66ba73074be86fe6
2017-12-07 18:38:10 +00:00
Tao Bao 47e5a8d085 applypatch: Remove the 'st' field from FileContents.
It used to keep track of the stat(2) info (e.g. st_mode/st_gid/st_uid)
while patching a file in file-based OTA.

Test: Build and use the new updater to apply an update on bullhead.
Change-Id: Ibf8f0f4b14298a9489bf24a2678bb279c5d9c8f3
2017-12-07 10:01:57 -08:00
Elliott Hughes ed369101ba Merge "Add a /bin symlink for consistency." 2017-12-07 16:55:25 +00:00
Elliott Hughes 4dca6f12db Add a /bin symlink for consistency.
Bug: http://b/63142920
Test: builds
Change-Id: I1f96935daca4d79f753e172067e07f8e27ea819e
2017-12-06 08:41:50 -08:00
Jaegeuk Kim c1c7311b8a add sload.f2fs for recovery format
Change-Id: Iddfe54b2b36f2d531925cbe61c98dbfb4903c0d1
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-12-04 20:27:49 -08:00
android-build-team Robot f968a2e9eb Snap for 4481641 from 1ab7bf47a6 to pi-release
Change-Id: Ifeab1a783e7a58b9ec2b2a2e8e458e0c7a981362
2017-12-03 08:37:21 +00:00
Tianjie Xu 1ab7bf47a6 Merge "Detect interrupted update due to power off" am: d8fadfb606 am: d9caba2bbe
am: db20e41b0c

Change-Id: Ibd568f8881e3c9dd16c1567857d49badf9d4cdc2
2017-12-01 03:02:14 +00:00
Tianjie Xu db20e41b0c Merge "Detect interrupted update due to power off" am: d8fadfb606
am: d9caba2bbe

Change-Id: I1f15871dde9525441f292bd1f546aaad0de158e5
2017-12-01 03:00:12 +00:00
Tianjie Xu d9caba2bbe Merge "Detect interrupted update due to power off"
am: d8fadfb606

Change-Id: I2295430f7153711fb4e23d3e6f7af7c65efb7c54
2017-12-01 02:58:41 +00:00
Treehugger Robot d8fadfb606 Merge "Detect interrupted update due to power off" 2017-12-01 02:52:23 +00:00
Tianjie Xu 99b73be3a8 Detect interrupted update due to power off
An interrupted update may stash extra blocks in /cache, leading to a
failure when checking the cache size. We can save the incremented
retry_count in the BCB before installing the update; and distinguish
a fresh update from an interrupted one this way.

Bug: 68679601
Test: An interrupted update reapplies successfully.
Change-Id: Ic1403e1fd25a937c91ef34c14b92a0f6c8f1c0f4
2017-11-30 16:25:47 -08:00
android-build-team Robot 1e5b2d9a10 Snap for 4462748 from debdd1732c to pi-release
Change-Id: I058b404064e01d68928f38aa15024ca54eceb5dd
2017-11-21 08:24:04 +00:00
Yifan Hong debdd1732c Merge "is_battery_ok use health 2.0 HAL" 2017-11-20 22:52:05 +00:00
Jin Qian 86104180a0 Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355c am: 25e27f48db
am: 7a1abb9279

Change-Id: I6836e9294639fd99f65541960f33234e30262e2e
2017-11-20 18:57:20 +00:00
Jin Qian 7a1abb9279 Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355c
am: 25e27f48db

Change-Id: I1a9171a1f31384915c7a3b72785265b85a697979
2017-11-20 18:54:48 +00:00
Jin Qian 25e27f48db Merge "root: Fix an issue when volume length from fs_mgr is negative."
am: 5ce9fe355c

Change-Id: I4ff7bccb0dd2fecf309f3a3d23379d2467d64aea
2017-11-20 18:52:48 +00:00
Treehugger Robot 5ce9fe355c Merge "root: Fix an issue when volume length from fs_mgr is negative." 2017-11-20 18:47:56 +00:00
android-build-team Robot 9475d96da1 Snap for 4459973 from 0a0b6a9fe1 to pi-release
Change-Id: I21d065629a3f9cc1b244da88cc133712ec7ce718
2017-11-19 08:21:48 +00:00
Jin Qian cc10008887 root: Fix an issue when volume length from fs_mgr is negative.
fs_mgr passes negative length as offset for crypt_footer. We need
to compute the actual device size for this case in addition to
when length is zero.

Bug: 68949069
Change-Id: I803955dd9591ad7752cee0dea9b683be8f4fd4ba
2017-11-18 21:54:44 -08:00
Tianjie Xu 0a0b6a9fe1 Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922 am: 086202e30d
am: 2a8e4095cb

Change-Id: I40e952051126d2df4530a11c4aee434142a55736
2017-11-17 16:18:17 +00:00
Tianjie Xu 2a8e4095cb Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922
am: 086202e30d

Change-Id: I7d6725aec1f22e006b1945c0068c61352785c509
2017-11-17 16:15:43 +00:00
Tianjie Xu 086202e30d Merge "Add libbrotli as a dependency when building applypatch binary"
am: c7069cc922

Change-Id: I3379f84048c1b4c4858da537d045a1012c358b8b
2017-11-17 16:13:13 +00:00
Tianjie Xu c7069cc922 Merge "Add libbrotli as a dependency when building applypatch binary" 2017-11-17 16:09:08 +00:00
Tianjie Xu bb436b397a Merge "Switch imgdiff to libbase logging" am: fd9c25e636 am: 47c8c290ec
am: 365c98fd1d

Change-Id: I88eca49e6004615f9398c42b6dfc79f8dc53085c
2017-11-17 06:00:12 +00:00
Tianjie Xu 365c98fd1d Merge "Switch imgdiff to libbase logging" am: fd9c25e636
am: 47c8c290ec

Change-Id: I8712d65b019e294104bcbc8497a05fa6cc49024a
2017-11-17 05:58:10 +00:00
Tianjie Xu 47c8c290ec Merge "Switch imgdiff to libbase logging"
am: fd9c25e636

Change-Id: Iaf36238df9567f9e0e08abec2581e55d4692068b
2017-11-17 05:56:10 +00:00
Tianjie Xu fd9c25e636 Merge "Switch imgdiff to libbase logging" 2017-11-17 05:53:58 +00:00
android-build-team Robot 8e4dc2a04c Snap for 4455093 from 8e376e01e7 to pi-release
Change-Id: I13180d402b826b71eb3e7ec42836e48f12f9de7c
2017-11-16 08:23:54 +00:00
Tianjie Xu 6e293c99c1 Switch imgdiff to libbase logging
Also add a verbose option. And we won't print messages of 'info'
severity unless '-v' is present.

Test: run imgdiff and check the logs.
Change-Id: I1b90874baea8e72e2a2323a0b63bc5d35e653e6b
2017-11-15 22:35:39 -08:00
Tao Bao 8e376e01e7 Merge "minadbd: Remove two warning options." am: 7bd61f0cc0 am: 345f350540
am: 97a4750098

Change-Id: I5b8199d02212b0b2283e647effa3b1829704e27c
2017-11-15 23:07:38 +00:00
Tao Bao 97a4750098 Merge "minadbd: Remove two warning options." am: 7bd61f0cc0
am: 345f350540

Change-Id: I95cf7f4af44c8abc2ced807e0a3a2fb063448fc1
2017-11-15 23:06:11 +00:00
Tao Bao 345f350540 Merge "minadbd: Remove two warning options."
am: 7bd61f0cc0

Change-Id: Id5e986ecd00cb2b953d761957a987a1b0c5ebf20
2017-11-15 23:04:09 +00:00
Tao Bao 7bd61f0cc0 Merge "minadbd: Remove two warning options." 2017-11-15 22:59:40 +00:00
Tao Bao f87d20404d minadbd: Remove two warning options.
'-Wimplicit-function-declaration' is not needed (it's for C89) and
already enabled by -Wall.

For '-Wno-missing-field-initializers', don't see any existing case that
requires the flag.

Test: `mmma -j bootable/recovery` on aosp_{bullhead,marlin}-userdebug.
Change-Id: I46604723087ed9a7747f6cae31a95fc0074c6758
2017-11-15 11:34:26 -08:00
Yifan Hong e8e4c40246 is_battery_ok use health 2.0 HAL
Test: call is_battery_ok in graphics test, and test manually
Bug: 69268160
Bug: 63702641

Change-Id: Ifcf4d2e2cb459689c11fc5d1b880bb053aaae8ae
2017-11-14 11:29:53 -08:00
android-build-team Robot 89de5755aa Snap for 4450504 from 60ee026849 to pi-release
Change-Id: Iee0ada7e7310070bb3b353643ceaced0eb019471
2017-11-14 08:27:34 +00:00
Jaegeuk Kim 60ee026849 Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd am: c418bfeae2
am: e9e7fcf327

Change-Id: I8d2d42d66f4b96ea281b5ca7a3092273a12f7b7b
2017-11-14 03:22:31 +00:00
Jaegeuk Kim e9e7fcf327 Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd
am: c418bfeae2

Change-Id: I2a040a11a71868915658958dbecf4bdd23c25e0c
2017-11-14 03:01:01 +00:00
Jaegeuk Kim c418bfeae2 Merge "recovery: format f2fs with encrypt/quota"
am: d4b6e25fdd

Change-Id: I1d17a488d2eea4d858fa31e7a00d694e20b011b3
2017-11-14 02:45:25 +00:00
Treehugger Robot d4b6e25fdd Merge "recovery: format f2fs with encrypt/quota" 2017-11-14 01:49:26 +00:00
Jaegeuk Kim 1a8bb0f542 recovery: format f2fs with encrypt/quota
Change-Id: Ia393b7b78b45f09964449ec0e255aa26bb3b8ddf
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-11-13 14:05:00 -08:00
android-build-team Robot b2a5691d57 Snap for 4447680 from d70f5d924b to pi-release
Change-Id: I378f477fd3a22cf964e0fcd2533d45e6609d73d7
2017-11-12 08:35:54 +00:00
Tao Bao d70f5d924b Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03 am: e2296b7a25
am: efcd98da32

Change-Id: I47c49255a65452c4842d5cffd382689a52129dcb
2017-11-11 01:22:35 +00:00
Tao Bao efcd98da32 Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03
am: e2296b7a25

Change-Id: I7e1a7bd12c1cc3a03b7947b22a947eee16dacbff
2017-11-11 01:20:04 +00:00