Commit Graph
10911 Commits
Author SHA1 Message Date
Tianjie Xu 09a8f76ac2 Implement ShowMenu for StubRecoveryUI
The ShowMenu in StubRecoveryUI used to return initial selection
immediately. This leads to an immediate reboot if we enter recovery
with a stub UI and wait for user's input. This cl changes the behavior
of stub UI's ShowMenu so that it waits keys in loop, and only returns in
the case of interruption or time out.

Bug: 130535924
Test: start recovery with a stub UI, wait for the timeout
Change-Id: I96ad8aad8930756b09101bb98ba5fbe7b53bcb37
2019-06-27 15:54:59 -07:00
Tao Baoandandroid-build-merger 18de138abd Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4
am: 9b57172706

Change-Id: Iafb11e2631ffb889c12293f82a9fce2af00e8f7c
2019-06-27 15:38:36 -07:00
Tao Baoandandroid-build-merger 9b57172706 Merge "recovery_ui: Remove redundant menu creation."
am: 0ad3ec03e4

Change-Id: Ied20e2cb3b6eb91cc819242b3782cf2fd5021e83
2019-06-27 15:27:33 -07:00
Treehugger RobotandGerrit Code Review 0ad3ec03e4 Merge "recovery_ui: Remove redundant menu creation." 2019-06-27 21:46:14 +00:00
Tao Bao fa8e02af7c recovery_ui: Remove redundant menu creation.
Test: Boot into recovery and "Run graphics test".
Change-Id: Icbf1c230b4af57cf32b3c7a4b30ddbabc21d5618
2019-06-27 09:07:51 -07:00
big biffandGerrit Code Review 0bd7c59026 Merge "ext4crypt: support synthetic keys v3 on May update" into android-9.0 2019-06-25 02:01:42 +02:00
Tianjie Xuandandroid-build-merger dc267f46ce Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7 am: 3aaf87cf4e am: a2a500381a
am: eaacfc1362

Change-Id: Ib410c48f9253468f03468c21fdf3e7fc36e7881b
2019-06-24 14:46:28 -07:00
Tianjie Xuandandroid-build-merger eaacfc1362 Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7 am: 3aaf87cf4e
am: a2a500381a

Change-Id: I9a82bd762e22a1bc6868084912b4d54217709429
2019-06-24 14:36:30 -07:00
Tianjie Xuandandroid-build-merger a2a500381a Merge "Implement updater runtime for dynamic partitions" am: db0a68e6b7
am: 3aaf87cf4e

Change-Id: I66feb637884013458816bb89e766aedb39bef990
2019-06-24 14:32:30 -07:00
Tianjie Xuandandroid-build-merger 3aaf87cf4e Merge "Implement updater runtime for dynamic partitions"
am: db0a68e6b7

Change-Id: I3de90cb6730b05cb1d238131a5d474e20d48890c
2019-06-24 14:28:55 -07:00
David Anderson 32148d9a0a Fix build for API change to DestroyLogicalPartition().
This method no longer contains a timeout parameter; it has been
removed in favor of changes to libdm.

Bug: 135771280
Test: builds
Change-Id: Id8c0f17c2787412bc4588af5a1bc49cc8e6edd51
2019-06-24 13:51:43 -07:00
Treehugger RobotandGerrit Code Review db0a68e6b7 Merge "Implement updater runtime for dynamic partitions" 2019-06-24 20:24:49 +00:00
Tianjie Xu d118833f3e Implement updater runtime for dynamic partitions
The simulator skips executing the operations for dynamic partitions, and
will use the logical images under target_files/IMAGES directly. (Similar
to the targets without DAP enabled)

Bug: 131911365
Test: run update on cuttlefish, run simulator
Change-Id: Id318d97ece4560df9f20dc5cabeb8b2e261bdf9c
2019-06-24 12:46:28 -07:00
Tao Baoandandroid-build-merger a46af60399 Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077b am: b50f855396 am: 00d4092790
am: c467b32bdb

Change-Id: I3532ccf5a602e60b308a15e670b589823680d553
2019-06-24 10:36:00 -07:00
Tao Baoandandroid-build-merger c467b32bdb Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077b am: b50f855396
am: 00d4092790

Change-Id: I46235b57a1845503698e280452b55a87e3d29842
2019-06-24 10:17:16 -07:00
Tao Baoandandroid-build-merger 00d4092790 Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." am: b87520077b
am: b50f855396

Change-Id: If1cc36794ce4dd4a14b6e1225c025305a95d793e
2019-06-24 09:24:31 -07:00
Tao Baoandandroid-build-merger b50f855396 Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default."
am: b87520077b

Change-Id: I1098551642eda063cc2c0c19cc36ce10cbf58804
2019-06-24 08:57:34 -07:00
Treehugger RobotandGerrit Code Review b87520077b Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." 2019-06-24 15:41:27 +00:00
Ian Macdonaldandbig biff a3b25a3ebe Backup_Tar(): Properly localise string instead of using English.
Change-Id: Id13885a30e3a412e5b7b42de0e63cd7fc885dfc1
2019-06-24 00:28:38 +02:00
Tao Bao 061267eee9 updater_sample: Build SystemUpdaterSample as non-privileged app by default.
Prior to the change, SystemUpdaterSample was built as privileged app.
It must be installed along with the matching privapp-permissions
whitelist change (as noted in updater_sample/README.md), otherwise would
block device booting if installed unintentionally (e.g. with `mm` or
`mmma`).

This CL avoids putting the device in a bad state due to a sample app.

Fixes: 135703777
Test: `lunch aosp_taimen-userdebug && m -j installclean &&
          mmma -j bootable/recovery && m -j`
      Flash on device and boot successfully.
Test: Run the tests per instructions in updater_sample/README.md.
Change-Id: Ib8b587c77570f05f7db748fad84744fa45016aab
2019-06-21 12:10:36 -07:00
Tianjie Xuandandroid-build-merger 877381c08f Merge "Support starting fuse from a block map" am: 090b62832f am: b96f2bf618 am: a51a41101a
am: fe52eb7869

Change-Id: Iae78957aff06d62c3a3fba61ada09e512281e757
2019-06-21 11:10:20 -07:00
Tianjie Xuandandroid-build-merger fe52eb7869 Merge "Support starting fuse from a block map" am: 090b62832f am: b96f2bf618
am: a51a41101a

Change-Id: I0e71e89b2cf9d81fe30db5666e5dfec4282fb221
2019-06-21 10:59:16 -07:00
Tianjie Xuandandroid-build-merger a51a41101a Merge "Support starting fuse from a block map" am: 090b62832f
am: b96f2bf618

Change-Id: I2a201ebe2a2bdcdfac1a2ffbf8c948b9df1b8c76
2019-06-21 10:51:22 -07:00
Tianjie Xuandandroid-build-merger b96f2bf618 Merge "Support starting fuse from a block map"
am: 090b62832f

Change-Id: I7f90b15d7ab0cf00b66ac242954490112cbd661d
2019-06-21 10:41:10 -07:00
Tianjie XuandGerrit Code Review 090b62832f Merge "Support starting fuse from a block map" 2019-06-21 17:14:10 +00:00
Tianjie Xuandandroid-build-merger 70ea8e0035 Merge "Implement the TargetFile and BuildInfo" am: 9b76970e9a am: 75c4b32e3a am: 252f3d3392
am: e63ebce76d

Change-Id: I9a096b0ce4e8e6038ab4ca1582a717c077a71a89
2019-06-20 18:16:52 -07:00
Tianjie Xuandandroid-build-merger e63ebce76d Merge "Implement the TargetFile and BuildInfo" am: 9b76970e9a am: 75c4b32e3a
am: 252f3d3392

Change-Id: Ic1ac9fbe30b125271c48d14db60e50b3cc15293b
2019-06-20 17:40:07 -07:00
Tianjie Xuandandroid-build-merger 252f3d3392 Merge "Implement the TargetFile and BuildInfo" am: 9b76970e9a
am: 75c4b32e3a

Change-Id: I2eec826e00d4a9fbe2660c76d49d78be886406c8
2019-06-20 17:29:04 -07:00
Tianjie Xuandandroid-build-merger 75c4b32e3a Merge "Implement the TargetFile and BuildInfo"
am: 9b76970e9a

Change-Id: I2d188eae7305bb82c7407bcbb04282b65768dde1
2019-06-20 17:17:56 -07:00
Tianjie XuandGerrit Code Review 9b76970e9a Merge "Implement the TargetFile and BuildInfo" 2019-06-20 22:39:42 +00:00
Tianjie Xu f6158eb918 Support starting fuse from a block map
Factor out a new function from ApplyFromSdcard that installs a package
from a local path. Inside this function, we start the fuse and choose the
type of data provider depending on the path string. And similar to the
existing logic, we treat the package as a block map if the path starts
with a '@'.

This is part of the effort to install larger than 2GiB packages on ILP32
devices.

Bug: 127071893
Test: Build a 32 bit sailfish and create a 3GiB OTA package. Sideload
the package, uncrypt and install the package from sdcard.

Change-Id: I328ea34fa530731acbce7554bfc3059313ad6ece
2019-06-20 13:53:40 -07:00
android-build-team Robot 8f5d76996a Snap for 5674532 from 2b40105c43 to qt-c2f2-release
Change-Id: I438a83fcc9087046c214cb4e24542bb96885589d
2019-06-20 03:11:53 +00:00
android-build-team Robot 5a624c34bc Snap for 5674428 from 2b40105c43 to qt-qpr1-release
Change-Id: I5a500d2edf16ca3024d8f929069228644fac08f3
2019-06-20 03:11:43 +00:00
android-build-team Robot 2155f27504 Snap for 5674462 from cdbd84de26 to qt-release
Change-Id: I6222c2543c25bd0a6895bb9a67bffbce02d43b95
2019-06-20 03:09:34 +00:00
android-build-team Robot f8dbaf76ad Merge cherrypicks of [8059010, 8059027, 8059344, 8059225, 8059029, 8058795, 8059012] into qt-release
Change-Id: I53a9ac8e9fed7849a90edb11ef3f6a9d393b7968
2019-06-19 18:51:06 +00:00
Zhijun Heandandroid-build-team Robot 9c207203b2 Revert "libprocessgroup users use libcutils"
This reverts commit 46ec20b692.

Reason for revert: breaks all camera use cases

Bug: 135568875
Change-Id: I86747c0df5489f80d1966dd07669637597fb2b00
(cherry picked from commit cdbd84de26)
2019-06-19 18:49:54 +00:00
Zhijun Heandandroid-build-merger ee63918557 Merge "Revert "libprocessgroup users use libcutils" am: cdbd84de26 am: 81e341f224" into qt-r1-dev-plus-aosp
am: 3e11398da0

Change-Id: Iffbe95054efec3c26801271698e60e1ad616b2d1
2019-06-18 23:44:03 -07:00
Zhijun Heandandroid-build-merger 062420161d Revert "libprocessgroup users use libcutils" am: cdbd84de26 am: 2b40105c43
am: 7226135d9a

Change-Id: Iff5d6594d177fd34bdd88bad251b5b74c9081f9d
2019-06-18 23:38:15 -07:00
Android Build Merger (Role)andAndroid (Google) Code Review 3e11398da0 Merge "Revert "libprocessgroup users use libcutils" am: cdbd84de26 am: 81e341f224" into qt-r1-dev-plus-aosp 2019-06-19 06:06:23 +00:00
Zhijun Heandandroid-build-merger 7226135d9a Revert "libprocessgroup users use libcutils" am: cdbd84de26
am: 2b40105c43

Change-Id: Id10eb470b897d8dcd4442716a29c6522b084294d
2019-06-18 23:04:03 -07:00
Zhijun Heandandroid-build-merger 2312849a7e Revert "libprocessgroup users use libcutils" am: cdbd84de26
am: 81e341f224

Change-Id: I7c6a47d1116cca31da994635a764ad6c486f96cc
2019-06-18 23:02:06 -07:00
Zhijun Heandandroid-build-merger 2b40105c43 Revert "libprocessgroup users use libcutils"
am: cdbd84de26

Change-Id: I83e2eb9e4961141389d7c8d90fd70363985b9855
2019-06-18 22:50:40 -07:00
Zhijun Heandandroid-build-merger 81e341f224 Revert "libprocessgroup users use libcutils"
am: cdbd84de26

Change-Id: Ie511de7ec122730be63bca07eb4f3eda9bff266b
2019-06-18 22:50:33 -07:00
Zhijun He cdbd84de26 Revert "libprocessgroup users use libcutils"
This reverts commit 46ec20b692.

Reason for revert: breaks all camera use cases

Bug: 135568875
Change-Id: I86747c0df5489f80d1966dd07669637597fb2b00
2019-06-19 04:44:04 +00:00
Steven Morelandandandroid-build-merger 9fcb7ef958 libprocessgroup users use libcutils am: 46ec20b692 am: 60f68c7862
am: b671af8de0

Change-Id: I4bde785890d17f8d2a74afb0581e86f5714fe166
2019-06-18 20:29:29 -07:00
Steven Morelandandandroid-build-merger 2cb8782091 libprocessgroup users use libcutils am: 46ec20b692 am: f1532a9655
am: e9520c1057

Change-Id: I9a3f36bf6840a22c15660e6b87136d1a6a7e6432
2019-06-18 20:24:45 -07:00
android-build-team Robot 00fb807722 Snap for 5671249 from f1532a9655 to qt-qpr1-release
Change-Id: I9820970150af84fd563798dfb2b85b6ece61974d
2019-06-19 03:08:05 +00:00
android-build-team Robot 728b352c78 Snap for 5671254 from 46ec20b692 to qt-release
Change-Id: Ic69216c91b50b8004a00418511f3b1b6ab195381
2019-06-19 03:02:56 +00:00
Steven Morelandandandroid-build-merger b671af8de0 libprocessgroup users use libcutils am: 46ec20b692
am: 60f68c7862

Change-Id: I2eb4c4a485861f93579483d4dc2322346cc319cf
2019-06-18 17:20:38 -07:00
Steven Morelandandandroid-build-merger e9520c1057 libprocessgroup users use libcutils am: 46ec20b692
am: f1532a9655

Change-Id: I96e90a97c66bd2c625d3aa84e4b9c05ff92a5190
2019-06-18 17:17:16 -07:00