Commit Graph
10911 Commits
Author SHA1 Message Date
Automerger Merge Worker 8de3a75e87 Merge "Mark libedify library as recovery_available." am: e3c7b067c8
Change-Id: I038243c757cfc755893f3d468da6498c1c67d2fd
2020-01-24 02:42:06 +00:00
Yifan HongandGerrit Code Review e3c7b067c8 Merge "Mark libedify library as recovery_available." 2020-01-24 02:31:05 +00:00
P.Adarsh Reddy cd46c1a860 Mark libedify library as recovery_available.
Mark libedify library as recovery_available so that
this is available in recovery.

Bug: 148189099
Test: Tested compilation, library is recovery available.
Functionality wise, tested sideloading in recovery.
Change-Id: Ie4a7a3af1fd32b7ec1bf2016938550e9312a519b
2020-01-23 14:06:55 +00:00
Tianjie Xu 5e6c4e9a91 Force package installation with FUSE unless the package stores on device
The non-A/B package installation is subject to TOC/TOU flaw if the
attacker can switch the package in the middle of installation. And the
most pratical case is to store the package on an external device, e.g. a
sdcard, and swap the device in the middle.

To prevent that, we can adopt the same protection as used in sideloading
a package with FUSE. Specifically, when we install the package with FUSE,
we read the entire package to cryptographically verify its signature.
The hash for each transfer block is recorded in the memory (TOC), and
the subsequent reads (TOU) will be rejected upon dectecting a mismatch.

This CL forces the package installation with FUSE when the package stays
on a removable media.

Bug: 136498130
Test: Run bin/recovery --update_package with various paths;
and packages are installed from FUSE as expected
Test: recovery_component_test - all passing

Change-Id: Ibc9b095036a2fa624e8edf6c347ed4f12aef072f
Merged-In: Ibc9b095036a2fa624e8edf6c347ed4f12aef072f
2020-01-22 22:01:46 +00:00
TreeHugger RobotandAndroid (Google) Code Review 022526d691 Merge "Import translations. DO NOT MERGE" 2020-01-22 03:28:30 +00:00
Tianjie XuandBryan Ferris ba27adbbb6 Force package installation with FUSE unless the package stores on device
The non-A/B package installation is subject to TOC/TOU flaw if the
attacker can switch the package in the middle of installation. And the
most pratical case is to store the package on an external device, e.g. a
sdcard, and swap the device in the middle.

To prevent that, we can adopt the same protection as used in sideloading
a package with FUSE. Specifically, when we install the package with FUSE,
we read the entire package to cryptographically verify its signature.
The hash for each transfer block is recorded in the memory (TOC), and
the subsequent reads (TOU) will be rejected upon dectecting a mismatch.

This CL forces the package installation with FUSE when the package stays
on a removable media.

Bug: 136498130
Test: Run bin/recovery --update_package with various paths;
and packages are installed from FUSE as expected
Test: recovery_component_test - all passing

Merged-In: Ibc9b095036a2fa624e8edf6c347ed4f12aef072f
Change-Id: Ibc9b095036a2fa624e8edf6c347ed4f12aef072f
2020-01-21 21:48:13 +00:00
Automerger Merge Worker b892a6b788 Merge "Retire the Tron metrics reporting for non-A/B update" am: 6bdacc40ef am: fed0b90045 am: 2cc6f21833
Change-Id: I3cd62f30d3dc8c6e7d7402d5fa0f08c60a3d9b64
2020-01-21 19:46:11 +00:00
Automerger Merge Worker 2cc6f21833 Merge "Retire the Tron metrics reporting for non-A/B update" am: 6bdacc40ef am: fed0b90045
Change-Id: I50402237f4ef3ca99caa27bd474d1a2e7432a42f
2020-01-21 19:37:27 +00:00
Tianjie Xuandandroid-build-merger fed0b90045 Merge "Retire the Tron metrics reporting for non-A/B update"
am: 6bdacc40ef

Change-Id: I3cb646b40746b06de19d7c50504a8699b2081fdc
2020-01-21 11:21:35 -08:00
Tianjie XuandGerrit Code Review 6bdacc40ef Merge "Retire the Tron metrics reporting for non-A/B update" 2020-01-21 19:10:46 +00:00
Bill Yi 23f15ec2f2 Import translations. DO NOT MERGE
Change-Id: Ie0e80dec4c698c6c6fbf5edd7a434bdcad975951
Auto-generated-cl: translation import
2020-01-21 09:03:54 -08:00
Tianjie Xu eb27bfe1e8 Retire the Tron metrics reporting for non-A/B update
This is part of the effort to remove libmetricslogger in platform.
Remove the reporting since the status from non-A/B update is less
important to us. Plus the gmscore already has a copy of the logic
to parse the contents from last_install and report non-A/B metrics
to the clearcut log.

bug: 147776349
Test: build
Change-Id: I4fc5d58fb616edb3eb1edadf4614d3eca15c7ce1
2020-01-16 15:17:41 -08:00
Automerger Merge Worker 7c0c9774b0 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 777a1965f3 am: 0be5110df4 -s ours
am skip reason: subject contains skip directive

Change-Id: I087563287addb19850f2e0278be5320aac223bbc
2020-01-16 01:58:36 +00:00
Automerger Merge Worker 0be5110df4 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 777a1965f3
Change-Id: I7e4b32b320b7a319ed3168c58a499c75024b920d
2020-01-16 01:46:05 +00:00
Xin Li 777a1965f3 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I2819646a4508345ecb63d46a1b1e9666e680d0cc
2020-01-15 15:59:08 -08:00
Automerger Merge Worker 57c7412ea5 Merge "edify: update for bison 3.5" am: 1477c867f7 am: 1dccf9c474 am: eeeac0514b
Change-Id: I8a8d2454a1f429b64beaa9067c96c679b679a93b
2020-01-15 22:45:43 +00:00
Automerger Merge Worker eeeac0514b Merge "edify: update for bison 3.5" am: 1477c867f7 am: 1dccf9c474
Change-Id: Ieccbcd941d6cf811628a33c81175ecf8b3c48b12
2020-01-15 22:33:25 +00:00
Steven Morelandandandroid-build-merger 1dccf9c474 Merge "edify: update for bison 3.5"
am: 1477c867f7

Change-Id: I8b3c51a1a420d24639feb1356575832db1d717af
2020-01-15 14:18:52 -08:00
Treehugger RobotandGerrit Code Review 1477c867f7 Merge "edify: update for bison 3.5" 2020-01-15 22:15:54 +00:00
Automerger Merge Worker 5da8f2a219 Merge "Convert update_host_simulator to Android.bp" am: d3e4ee7b16 am: 1d5b35dfb5 am: f34cfe9683
Change-Id: I981db0ce41b32e17466dd3ef6d72f98229f4c95c
2020-01-15 20:34:49 +00:00
Automerger Merge Worker f34cfe9683 Merge "Convert update_host_simulator to Android.bp" am: d3e4ee7b16 am: 1d5b35dfb5
Change-Id: I587f12b2efc027c7e3808a00744298623cb35e0b
2020-01-15 20:22:31 +00:00
Dan Willemsenandandroid-build-merger 1d5b35dfb5 Merge "Convert update_host_simulator to Android.bp"
am: d3e4ee7b16

Change-Id: Ida439dc9fde87cdad2ac1e43e25668f871d6ece4
2020-01-15 12:07:50 -08:00
Treehugger RobotandGerrit Code Review d3e4ee7b16 Merge "Convert update_host_simulator to Android.bp" 2020-01-15 20:05:46 +00:00
Dan Willemsen 5a6784168f Convert update_host_simulator to Android.bp
Bug: 130696912
Test: m update_host_simulator
Change-Id: I7b3c0217268a3edcf76548a5c83030050b2d17f3
2020-01-15 09:39:13 -08:00
Steven Moreland ee3dd45c07 edify: update for bison 3.5
Getting rid of warning, so using new define for turning on verbose
errors:
%define parse.error verbose

Bug: 31194194
Test: N/A
Change-Id: I47c200a1e669b5c5fc53d392f32b4c264a42182d
2020-01-14 20:56:40 +00:00
Automerger Merge Worker 010d9d7e92 Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t" am: b17cdb26df am: 7e1af2dd40 am: 444bfb7482
Change-Id: I0c27609dece2ad20a4a3e4587566e1195f04b4c0
2020-01-14 19:33:50 +00:00
Automerger Merge Worker 444bfb7482 Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t" am: b17cdb26df am: 7e1af2dd40
Change-Id: I05410938bc94fb40a9a57f297eb52d487fc2daca
2020-01-14 19:21:38 +00:00
Stephane Leeandandroid-build-merger 7e1af2dd40 Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t"
am: b17cdb26df

Change-Id: Ia47c5f257f1552e711705bcb974c068c201382ba
2020-01-14 11:07:08 -08:00
Stephane LeeandGerrit Code Review b17cdb26df Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t" 2020-01-14 18:42:31 +00:00
Stephane Lee 12952cdddb Fix ioctl FIONREAD call parameters to use int instead of size_t
Test: Ensure that calls to inotify_cb succeed; Ensure charger does not
crash

Change-Id: I9a7ca304057313c74ef02fd97223d0ed570c6206
2020-01-13 16:04:44 -08:00
Automerger Merge Worker ed29bf9a3b [automerger skipped] Import translations. DO NOT MERGE am: 7851fab973 -s ours am: 9f84418306 -s ours
am skip reason: subject contains skip directive

Change-Id: Ice2af52ae37404ce59fa47895de965d52c0c722a
2020-01-11 15:33:50 +00:00
Automerger Merge Worker 9f84418306 [automerger skipped] Import translations. DO NOT MERGE am: 7851fab973 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic3cd448883cffebeaca9bdf03d86a36df1faa125
2020-01-11 15:21:21 +00:00
Bill Yi 7851fab973 Import translations. DO NOT MERGE
Change-Id: Iab26dd7eda26ad0d105a69939091cc7cda35c371
Auto-generated-cl: translation import
2020-01-10 22:41:44 -08:00
Automerger Merge Worker 762da2c1b8 Merge "Add elsk@ to OWNERS" am: f52a8782b3 am: 2346f5bd6c am: 5e39aa4279
Change-Id: I66dda18690ce6f72005665a8c10339c32753997d
2020-01-08 22:57:06 +00:00
Automerger Merge Worker 5e39aa4279 Merge "Add elsk@ to OWNERS" am: f52a8782b3 am: 2346f5bd6c
Change-Id: Iefe607958520a381f013586628662931a60c8c16
2020-01-08 22:45:00 +00:00
Yifan Hongandandroid-build-merger 2346f5bd6c Merge "Add elsk@ to OWNERS"
am: f52a8782b3

Change-Id: I5815887ff946dcaa88b67965c77950a27f781866
2020-01-08 14:01:14 -08:00
Yifan HongandGerrit Code Review f52a8782b3 Merge "Add elsk@ to OWNERS" 2020-01-08 21:35:33 +00:00
Automerger Merge Worker 1bbec589b7 Merge "Mount snapshotted /system in Virtual A/B devices" am: 5ee782079a am: bc4b2b44e9 am: 367f7d173e
Change-Id: I5411bcca707627f0e821b4e4052476577e29faf4
2020-01-07 21:00:52 +00:00
Automerger Merge Worker 367f7d173e Merge "Mount snapshotted /system in Virtual A/B devices" am: 5ee782079a am: bc4b2b44e9
Change-Id: I0bee847aeea87381e704aff5d26fc9d84d0ec8ac
2020-01-07 20:44:25 +00:00
Alessio Balsiniandandroid-build-merger bc4b2b44e9 Merge "Mount snapshotted /system in Virtual A/B devices"
am: 5ee782079a

Change-Id: I763c7c0ca0ba5d9e6e6f822efa2e42e5ea1095bc
2020-01-07 12:30:18 -08:00
Treehugger RobotandGerrit Code Review 5ee782079a Merge "Mount snapshotted /system in Virtual A/B devices" 2020-01-07 20:26:43 +00:00
Yifan Hong cf58738b89 Add elsk@ to OWNERS
Test: none
Change-Id: Ibe39304e7ad2e23377853ef5753f7873348ff24b
2020-01-07 11:35:06 -08:00
bigbiffandGerrit Code Review 15434cdeec Merge "android-5.1: use char constructor for default on c++ streams" into android-9.0 2019-12-23 23:06:23 +00:00
Mauronofrio Matarrese 9632f301c1 Removing fake error: E: recv error on uevent
This shouldn't be an error, so i hide the line about the error.

Change-Id: I3ef667435dfa843440cc594409c8d20add676576
2019-12-23 09:28:10 +00:00
Ian Macdonaldandbigbiff f9156eaaab Complete overhaul of Dutch translation:
* All missing strings added (ref: en.xml).
* Many strings clarified and ambiguity removed.
* Inconsistent use of language reconciled.
* XML validated by xmllint(1).
* String length validated on device (G975F).

Change-Id: I4a4c3dc5a1147a62b8c141286fc7ac432678a322
2019-12-23 00:50:53 +00:00
Alessandro Astoneandbigbiff 5667feb0ac recovery: wipe bootloader message from index 0 when using custom offsets
* We may use a custom offset to:
   a) preserve data that oem wrote to the first bytes of misc
   b) skip recovery flags written by the bootloader (e.g. --wipe_data)

   For case a) one should set the offset 'x' to be at least greater than
   the size of bootloader_message struct (2048 bytes). If this is the case,
   then we zero out bytes x ~ x + 2047

   For case b) one should set the offset to be strictly smaller than
   the size of bootloader_message struct. If this is the case, then we
   zero out bytes 0 ~ 2047.
   This allows to clear any additional flag set by the bootloader,
   that would otherwise be forgotten in misc.
   This also guarantees that we do not involountarily wipe any data that
   the oem may have written starting at byte 2048 (coff coff LG)

Change-Id: I2d4e0702a2d8cbbef6274a87ce9499b0f69310dd
2019-12-22 21:20:48 +00:00
bigbiff d331705daa android-5.1: use char constructor for default on c++ streams
Change-Id: I4be681c2720f62182e57237b1cfefc384235f0e1
2019-12-22 16:05:12 -05:00
Alessandro Astoneandbigbiff 7ec5fd9e6d recovery: Move bldrmsg offset symbols to bootloader_message.cpp
* bootloader_message.cpp is the only file using
  BOOTLOADER_MESSAGE_OFFSET_IN_MISC and WIPE_PACKAGE_OFFSET_IN_MISC,
  so we can move their definitions to the cpp.
  This prevents the need to set BOARD_RECOVERY_BLDRMSG_OFFSET
  in every module that includes the header.

* Global cflags are no longer supported Oreo and up,
  so set the BOARD_RECOVERY_BLDRMSG_OFFSET via make variable

* Simplify logic, always set BOARD_RECOVERY_BLDRMSG_OFFSET.

Change-Id: I2b902bcce7f5ca13472e0ac30ac01b4991294dbe
2019-12-22 20:21:16 +00:00
Automerger Merge Worker a7063bb987 Merge "Link libvndksupport dynamically instead of statically." am: 8b9ac5b83d am: dddedcc3de am: 58c0120969
Change-Id: Ia6e355c01bbf5ee8931e44fb9674ccae3642fb9a
2019-12-19 18:35:27 +00:00
Automerger Merge Worker 58c0120969 Merge "Link libvndksupport dynamically instead of statically." am: 8b9ac5b83d am: dddedcc3de
Change-Id: Ic53f0c08c6159dcf52cca03b729cf536d0ff383b
2019-12-19 18:18:24 +00:00