Commit Graph

8701 Commits

Author SHA1 Message Date
Automerger Merge Worker 1551e2a5d1 Merge "Show warning message if sideload failed or is interrupted." am: e1d76ef395 am: d93d116134 am: 9763f002db
Change-Id: I987619c409d8fc9defb3184a51849ee2b81e25b8
2020-01-30 22:43:41 +00:00
Automerger Merge Worker 9763f002db Merge "Show warning message if sideload failed or is interrupted." am: e1d76ef395 am: d93d116134
Change-Id: Iecebcf108d57d14263e0a14687fe2d864fe579f2
2020-01-30 22:30:52 +00:00
Automerger Merge Worker d93d116134 Merge "Show warning message if sideload failed or is interrupted." am: e1d76ef395
Change-Id: I1f87047c256d49cd498e545b4899528c9d5a0ed3
2020-01-30 22:20:06 +00:00
Yifan Hong e1d76ef395 Merge "Show warning message if sideload failed or is interrupted." 2020-01-30 22:03:58 +00:00
TreeHugger Robot cbabf7cc0c Merge "Import translations. DO NOT MERGE" 2020-01-30 21:29:11 +00:00
Yifan Hong 13b099696f Show warning message if sideload failed or is interrupted.
For non A/B and Virtual A/B devices where sideloading may affect
the existing OS,
- If sideload has failed, show a warning message in recovery menu header.
- If sideload has interrupted, automatically reboot back into recovery and
  show the warning message in recovery menu header.

Test: the above
Fixes: 140749209
Change-Id: Ifdfc28b45975cdc31b6fce2ecb99acc31bc61fa8
2020-01-29 16:59:07 -08:00
Bill Yi 2b9be1f4e3 Import translations. DO NOT MERGE
Change-Id: Id8dd55dd5f36191402ba7f6b44e107f205fbf484
Auto-generated-cl: translation import
2020-01-29 15:36:57 -08:00
Automerger Merge Worker 89c9eae51e Merge "Prompt for confirmation before reboot if installation fails." am: 1b208af5d4 am: 05eec42808 am: 565397643b
Change-Id: I874e028ac058aac56430b6f2fb69d8217a3c13ec
2020-01-29 21:57:36 +00:00
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 Hong 05eec42808 Merge "Prompt for confirmation before reboot if installation fails."
am: 1b208af5d4

Change-Id: I04be948b2c16b0f838ec37fe310006baeb5f1604
2020-01-29 13:26:18 -08:00
Yifan Hong 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 5fa9733f9d Merge "Remove fsck_unshare_blocks." am: 699ea0f325 am: 79ce1d3420 am: ffea0e7333
Change-Id: If590516c09963e73b304cca1b7e07b62271d7c5c
2020-01-28 01:34:15 +00: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 Anderson 79ce1d3420 Merge "Remove fsck_unshare_blocks."
am: 699ea0f325

Change-Id: Iec58138809dd2809abb5de133810ba30a224dcce
2020-01-27 17:08:31 -08:00
Treehugger Robot 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 dd06949075 Merge "Set Casefold and PrjQuotas in Factory Reset" am: 1cf5b0b591 am: ddb9dbb52b am: a8a4fb3b18
Change-Id: Iab5c4265535dfe264a0ecb2acec6de6d44a04d31
2020-01-25 03:33:50 +00: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 Rosenberg ddb9dbb52b Merge "Set Casefold and PrjQuotas in Factory Reset"
am: 1cf5b0b591

Change-Id: I445400a7ee2ed293a712fad28eb4f8d0c750fa17
2020-01-24 19:09:33 -08:00
Treehugger Robot 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 e1714c623d Merge "Mark libedify library as recovery_available." am: e3c7b067c8 am: 8de3a75e87 am: 4366e0d470
Change-Id: I664abf3d93c9805226510592e6f20710130639dd
2020-01-24 03:12:04 +00: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 Hong 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
TreeHugger Robot 022526d691 Merge "Import translations. DO NOT MERGE" 2020-01-22 03:28:30 +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 Xu 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 Xu 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 Moreland 1dccf9c474 Merge "edify: update for bison 3.5"
am: 1477c867f7

Change-Id: I8b3c51a1a420d24639feb1356575832db1d717af
2020-01-15 14:18:52 -08:00
Treehugger Robot 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 Willemsen 1d5b35dfb5 Merge "Convert update_host_simulator to Android.bp"
am: d3e4ee7b16

Change-Id: Ida439dc9fde87cdad2ac1e43e25668f871d6ece4
2020-01-15 12:07:50 -08:00
Treehugger Robot 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 Lee 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