Commit Graph
8509 Commits
Author SHA1 Message Date
Automerger Merge Worker 565397643b Merge "Prompt for confirmation before reboot if installation fails." am: 1b208af5d4 am: 05eec42808
Change-Id: I691a30f8d114b0de68ba8a7d309a130ad4b4290c
2020-01-29 21:46:30 +00:00
Yifan Hongandandroid-build-merger 05eec42808 Merge "Prompt for confirmation before reboot if installation fails."
am: 1b208af5d4

Change-Id: I04be948b2c16b0f838ec37fe310006baeb5f1604
2020-01-29 13:26:18 -08:00
Yifan HongandGerrit Code Review 1b208af5d4 Merge "Prompt for confirmation before reboot if installation fails." 2020-01-29 20:32:27 +00:00
Yifan Hong c9163fdacc Prompt for confirmation before reboot if installation fails.
If previous installation fails, menu item 'Reboot system now'
and 'Power off' now prompts for confirmation from the user.

Known issues:
- If the sideload is interrupted, it'll still boot into normal
Android in the next cycle.
- If 'Enter fastbootd' is chosen, and then 'Enter recovery', such
prompt do not show up.

Test: manual
Fixes: 142892891

Change-Id: I929b80e0520bd3b9f56d88a4b2203fcdd8d7b013
2020-01-28 12:47:55 -08:00
Automerger Merge Worker ffea0e7333 Merge "Remove fsck_unshare_blocks." am: 699ea0f325 am: 79ce1d3420
Change-Id: I2e5b054970ad9d6783130414d7e82d6e62a541de
2020-01-28 01:22:27 +00:00
David Andersonandandroid-build-merger 79ce1d3420 Merge "Remove fsck_unshare_blocks."
am: 699ea0f325

Change-Id: Iec58138809dd2809abb5de133810ba30a224dcce
2020-01-27 17:08:31 -08:00
Treehugger RobotandGerrit Code Review 699ea0f325 Merge "Remove fsck_unshare_blocks." 2020-01-28 00:57:47 +00:00
David Anderson 969787cffd Remove fsck_unshare_blocks.
This code is dead. It was briefly used to support "adb remount" with
deduplicated partitions, but was very quickly obsoleted by overlayfs
support. There is no reason to include it anymore.

Bug: N/A
Test: N/A
Change-Id: I4cdcbf66bec80092f954826eaae037934ff37765
2020-01-27 09:30:55 -08:00
Automerger Merge Worker a8a4fb3b18 Merge "Set Casefold and PrjQuotas in Factory Reset" am: 1cf5b0b591 am: ddb9dbb52b
Change-Id: I3524e603efee4970622f761ced025c849965e830
2020-01-25 03:21:21 +00:00
Daniel Rosenbergandandroid-build-merger ddb9dbb52b Merge "Set Casefold and PrjQuotas in Factory Reset"
am: 1cf5b0b591

Change-Id: I445400a7ee2ed293a712fad28eb4f8d0c750fa17
2020-01-24 19:09:33 -08:00
Treehugger RobotandGerrit Code Review 1cf5b0b591 Merge "Set Casefold and PrjQuotas in Factory Reset" 2020-01-25 01:03:43 +00:00
Daniel Rosenberg f25b977740 Set Casefold and PrjQuotas in Factory Reset
This sets up devices to have casefolding and project quotas if they have
enabled the relevant product properties. For ext4, we must set wide
inodes at makefs time, but other things are enabled by fs_mgr with
tune2fs at boot time.

Bug: 138321217
Bug: 138322712
Test: Enable on a device.
      Reformat from recovery. Check that /data has the expected values
      using tune2fs/f2fs.fsck
Change-Id: If706a3cad591f311eb904df4deca531d0b3fe0c4
2020-01-24 15:49:00 -08:00
Automerger Merge Worker 4366e0d470 Merge "Mark libedify library as recovery_available." am: e3c7b067c8 am: 8de3a75e87
Change-Id: I508ad557bc9cef0f19c0727054edae49386eead3
2020-01-24 02:54:25 +00:00
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
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
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 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 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 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 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 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 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 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
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
Peter Collingbourneandandroid-build-merger dddedcc3de Merge "Link libvndksupport dynamically instead of statically."
am: 8b9ac5b83d

Change-Id: Ib5eaa527fbba27b700f6efc8b2536320252e4ee3
2019-12-19 10:03:09 -08:00
Peter CollingbourneandGerrit Code Review 8b9ac5b83d Merge "Link libvndksupport dynamically instead of statically." 2019-12-19 17:27:37 +00:00
Automerger Merge Worker 9d090b2ca6 Merge "Delete VINTF compatibility check during OTA." am: cae99c43de am: 567ae2f9e1
Change-Id: I40359f387e70e8055c12d0245a0e5d2132007889
2019-12-18 23:40:54 +00:00
Yifan Hongandandroid-build-merger 567ae2f9e1 Merge "Delete VINTF compatibility check during OTA."
am: cae99c43de

Change-Id: I8ec2ee4efdadf39dd1543c1929e5e9bb11500a8e
2019-12-18 15:19:40 -08:00
Yifan HongandGerrit Code Review cae99c43de Merge "Delete VINTF compatibility check during OTA." 2019-12-18 23:15:51 +00:00
Yifan Hong c77bb70166 Delete VINTF compatibility check during OTA.
Test: sideload OTA
Bug: 139300422
Change-Id: I3369b69242ccd7a64540a0c2d754a5d6fc50d072
2019-12-18 12:14:50 -08:00