Commit Graph

4458 Commits

Author SHA1 Message Date
Tianjie Xu 0965c583ef Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033 am: 0cd8986bc2
am: 05867dbecc

Change-Id: I41e9092a750acc7f71ec2d2fbd84cf2c98bb8f60
2017-04-22 00:37:19 +00:00
Tianjie Xu 05867dbecc Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033
am: 0cd8986bc2

Change-Id: I1c81003e76486748cbb02dd9d8fe11b167e4232b
2017-04-22 00:31:21 +00:00
Tianjie Xu 0cd8986bc2 Merge "Reboot the device on user build after the install fails" am: d6f436849d
am: 4849c87033

Change-Id: I7fd09a998e2a3d21ad9c772179890988b44809b5
2017-04-22 00:25:17 +00:00
Tianjie Xu 4849c87033 Merge "Reboot the device on user build after the install fails"
am: d6f436849d

Change-Id: I72eae6c525d6dd39c86a74b144d0970ad8793b42
2017-04-22 00:19:18 +00:00
Treehugger Robot d6f436849d Merge "Reboot the device on user build after the install fails" 2017-04-22 00:11:52 +00:00
Tianjie Xu d9d16297dd Reboot the device on user build after the install fails
Users can't do much after the install fails with the device showing
"error" under recovery. So our best choice is to reboot the device
since sometimes the system image is still bootable (i.e. on package
verification failure). At worst the device would stuck in a boot loop
where the users need the same professional knowledge to recover as
before.

Behaviors after installation failure (including data wipe):
If recovery text is visible:
No change.

If recovery text is not visible:
Old behavior: Wait under "error" screen. Reboot after UI timeout (120s)
              if not connected to usb charger.
New behavior: Wait for 5s (shortens from the 120s timeout) under "error"
              screen and reboot (w or w/o charger).

sideload-auto-reboot (only available for userdebug):
Old behavior: Reboot immediately after installation failure.
New behavior: Wait for 5s under "error" screen and reboot.

Bug: 35386985
Test: On angler user, device auto reboots 5s after a failing OTA.

Change-Id: I3ff0ead86e2ccec9445d6a2865bc2c463855f23c
2017-04-21 22:49:30 +00:00
Tianjie Xu 7a004a8402 Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7 am: 33a8900d2b
am: fa982415a5

Change-Id: I11760a580106049067f4a923f5d7c17f2ae87b82
2017-04-20 02:31:47 +00:00
Tianjie Xu fa982415a5 Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7
am: 33a8900d2b

Change-Id: I0e83d8f196397b2eb7afaab9c531d2bebec29346
2017-04-20 01:43:21 +00:00
Tianjie Xu 33a8900d2b Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3
am: 235a2cc1c7

Change-Id: I71fd3d604a8adadb29f9e4f1916a1e1bdb5eebed
2017-04-20 01:41:50 +00:00
Tianjie Xu 235a2cc1c7 Merge "Minor clean up to minadbd_services.cpp"
am: fa7d55a7e3

Change-Id: I741417224e3ee22916e5b0ae6adc237887bd3ecb
2017-04-20 01:39:20 +00:00
Tianjie Xu fa7d55a7e3 Merge "Minor clean up to minadbd_services.cpp" 2017-04-20 01:34:30 +00:00
Tao Bao 286b98f551 Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abcc am: d7a065eb1c
am: 3a484e49bb

Change-Id: Iece1d57f4be2b9b7c71f1dbdbc30f5ec25ad8671
2017-04-20 01:03:18 +00:00
Tao Bao 3a484e49bb Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abcc
am: d7a065eb1c

Change-Id: I885d137e5ffc873ab8af1155b1e85eca65d8f03c
2017-04-20 00:20:45 +00:00
Tao Bao d7a065eb1c Merge "Call libvintf to verify package compatibility." am: b0945e1a23
am: 8e7884abcc

Change-Id: I229350afea463c596d7155794fca300bf9547229
2017-04-20 00:19:15 +00:00
Tao Bao 8e7884abcc Merge "Call libvintf to verify package compatibility."
am: b0945e1a23

Change-Id: I1c54dafa606aa4ba0955983f3a5023d7b65ded1b
2017-04-20 00:17:15 +00:00
Tao Bao b0945e1a23 Merge "Call libvintf to verify package compatibility." 2017-04-20 00:10:09 +00:00
Tao Bao 71df092bf2 Call libvintf to verify package compatibility. am: da320ac6ab
am: 34ae4d02ce

Change-Id: I96580281c3d898b382e9870f3dbc8db218114e27
2017-04-19 22:25:53 +00:00
Tao Bao 34ae4d02ce Call libvintf to verify package compatibility.
am: da320ac6ab

Change-Id: I5749ac56a8eed8c3ce8420360643a4cfe8d52bc7
2017-04-19 22:19:06 +00:00
Tao Bao 919d2c9a53 Call libvintf to verify package compatibility.
The libvintf API has landed. Hook up to do the actual verification.

Bug: 36597505
Test: recovery_component_test
Test: m recoveryimage; adb sideload on angler and sailfish, with
      packages that contain dummy compatibility entries.
Test: m recoveryimage; adb sideload on angler and sailfish, with
      packages that don't contain any compatibility entries.
Change-Id: Idbd6f5aaef605ca51b20e667505d686de5ac781f
(cherry picked from commit da320ac6ab)
2017-04-19 15:17:16 -07:00
Tianjie Xu 6af51a0eef Minor clean up to minadbd_services.cpp
Switch some function signatures to std::string to avoid memory leak.

Bug: 30039381
Test: sideload a package on angler
Change-Id: Iae1e75871a782d6e5d6dde5dcf3f18469eb63f7d
2017-04-19 14:54:04 -07:00
Tao Bao da320ac6ab Call libvintf to verify package compatibility.
The libvintf API has landed. Hook up to do the actual verification.

Bug: 36597505
Test: recovery_component_test
Test: m recoveryimage; adb sideload on angler and sailfish, with
      packages that contain dummy compatibility entries.
Test: m recoveryimage; adb sideload on angler and sailfish, with
      packages that don't contain any compatibility entries.
Change-Id: Idbd6f5aaef605ca51b20e667505d686de5ac781f
2017-04-19 13:04:57 -07:00
Tao Bao 0ae77823f4 Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0 am: 7b9b77f445
am: 67045afa85

Change-Id: I449c52d75ee821293e57878eda5b95782912d429
2017-04-19 19:03:23 +00:00
Tao Bao 67045afa85 Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0
am: 7b9b77f445

Change-Id: I9e3563e052ce1b993981af29c8af9fd4ab4f3516
2017-04-19 18:58:52 +00:00
Tao Bao 7b9b77f445 Merge "Add tests for read_metadata_from_package()." am: e888d45950
am: c08c055ce0

Change-Id: I000e0cc00b510a7734e5cc41143f1d5939293b24
2017-04-19 18:57:22 +00:00
Tao Bao c08c055ce0 Merge "Add tests for read_metadata_from_package()."
am: e888d45950

Change-Id: I182da1ac7d39120d8959b96dfbd70b344c27d600
2017-04-19 18:55:22 +00:00
Tao Bao e888d45950 Merge "Add tests for read_metadata_from_package()." 2017-04-19 18:51:15 +00:00
Tianjie Xu cc3bebafa2 Merge "Add 'system' to update_verifier's gid" into oc-dev am: 464c6ba9f8
am: 2e8daf8b83

Change-Id: I935d795db67b120883a34cb9e9254cdc40083fea
2017-04-19 18:24:18 +00:00
Tianjie Xu 2e8daf8b83 Merge "Add 'system' to update_verifier's gid" into oc-dev
am: 464c6ba9f8

Change-Id: I26b77c2f8bb3d041eea402fc05bcb2d820775471
2017-04-19 18:21:49 +00:00
Tianjie Xu 464c6ba9f8 Merge "Add 'system' to update_verifier's gid" into oc-dev 2017-04-19 18:17:23 +00:00
Tao Bao 30927408b8 Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233d am: 6650c0426f
am: 1918fbcd40

Change-Id: Ib0eb86629ac0f1b0092120b4de2a71c7fe2a6956
2017-04-19 18:11:49 +00:00
Tao Bao 1918fbcd40 Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233d
am: 6650c0426f

Change-Id: Iacabb5816f811b519bde548c620929dc7b1841dd
2017-04-19 18:09:18 +00:00
Tao Bao 6650c0426f Merge "Minor clean up to install.cpp." am: 08146728c1
am: 668e84233d

Change-Id: I961822ff4c9263cef813c98877f1c3a3e9bf6441
2017-04-19 18:07:19 +00:00
Tao Bao 668e84233d Merge "Minor clean up to install.cpp."
am: 08146728c1

Change-Id: Ie1f04ce992d48f37fae1fc8c8f083b21634e1024
2017-04-19 18:05:18 +00:00
Tao Bao 08146728c1 Merge "Minor clean up to install.cpp." 2017-04-19 18:01:08 +00:00
Tianjie Xu 128e771503 Add 'system' to update_verifier's gid
This addresses the denial to /dev/cpuset/tasks:
update_verifier: type=1400 audit(0.0:377): avc: denied { dac_override }
for capability=1 scontext=u:r:update_verifier:s0
tcontext=u:r:update_verifier:s0 tclass=capability permissive=1

update_verifier: type=1400 audit(0.0:378): avc: granted { write } for
name="tasks" dev="cgroup" ino=5 scontext=u:r:update_verifier:s0
tcontext=u:object_r:cgroup:s0 tclass=file

Bug: 37358323
Test: denial message gone after adding system group
Change-Id: I66b4925295a13fbc1c6f26a1bb9bd2f9cebcec3d
(cherry-picked from 0ad2de5eab)
2017-04-19 06:44:43 +00:00
Tao Bao 8a7afcc6ed Add tests for read_metadata_from_package().
Test: recovery_component_test
Change-Id: I672a6a4f101c72e82b9f25f165dccd1c9520627b
2017-04-18 22:07:44 -07:00
Tao Bao f8119fbafb Minor clean up to install.cpp.
- Move some macros / constants into functions;
- Remove unneeded #include "minui/minui.h";
- Remove two dead constants (DEFAULT_{FILES,IMAGES}_PROGRESS_FRACTION).

Test: mmma bootable/recovery
Change-Id: Ib808f14b7569e06e23a8a7cc9b2d4e9aa5469de1
2017-04-18 22:07:00 -07:00
Tao Bao 447ec908db Merge "Add tests for update_binary_command()." into oc-dev am: a6084f8c9b -s ours
am: fbc78e6f01

Change-Id: I306e52d9057772c398e6ab12f5f37347bcb02fff
2017-04-19 04:31:02 +00:00
Tao Bao fbc78e6f01 Merge "Add tests for update_binary_command()." into oc-dev
am: a6084f8c9b  -s ours

Change-Id: Ia9a1fc3898b31d658e82883dbac17c511168bb94
2017-04-19 04:28:33 +00:00
Tao Bao a6084f8c9b Merge "Add tests for update_binary_command()." into oc-dev 2017-04-19 04:20:46 +00:00
Tao Bao a233a89d99 Add tests for update_binary_command().
Expose update_binary_command() through private/install.h for testing
purpose.

Also make minor clean-ups to install.cpp: a) adding more verbose logging
on ExtractToMemory failures; b) update_binary_command() taking
std::string instead of const char*; c) moving a few macro and global
constants into update_binary_command().

Bug: 37300957
Test: recovery_component_test on marlin
Test: Build new recovery and adb sideload on angler and sailfish.
Change-Id: Ib2d9068af3fee038f01c90940ccaeb0a7da374fc
Merged-In: Ib2d9068af3fee038f01c90940ccaeb0a7da374fc
(cherry picked from commit bc4b1fe4c4)
2017-04-18 20:35:29 -07:00
Tao Bao 9c5ae7445f Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7 am: d218dca8f9
am: c6bb44e9bf

Change-Id: I42f53d3d48caf913fa8d4ba2eba475e20c8b65f9
2017-04-19 01:54:22 +00:00
Tao Bao c6bb44e9bf Merge "Add tests for update_binary_command()." am: 44f61b4ce5 am: 1fc109bdc7
am: d218dca8f9

Change-Id: Ib8520d3249f3c131be5008324c52e4b94cf8426d
2017-04-19 01:52:22 +00:00
Tao Bao d218dca8f9 Merge "Add tests for update_binary_command()." am: 44f61b4ce5
am: 1fc109bdc7

Change-Id: I831f0f5f058cc56af34f3f4b77a48b17050256ef
2017-04-19 01:50:23 +00:00
Tao Bao 1fc109bdc7 Merge "Add tests for update_binary_command()."
am: 44f61b4ce5

Change-Id: I12b49334130d68305753096f6a3376e246f947bc
2017-04-19 01:48:23 +00:00
Tao Bao 44f61b4ce5 Merge "Add tests for update_binary_command()." 2017-04-19 01:43:03 +00:00
Tom Cherry 8b3292aa63 init.rc: Remove sys.powerctl action am: 37ac94978c
am: 668b411a8e

Change-Id: I71e9d44138c081f78a49462218e6d1b7968cce26
2017-04-18 21:35:19 +00:00
Tom Cherry 668b411a8e init.rc: Remove sys.powerctl action
am: 37ac94978c

Change-Id: Idc5d954493b7078293f7b40b7a70ef047fb9f467
2017-04-18 21:29:18 +00:00
Tianjie Xu cdea003277 Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f am: 4575986069 am: 239d154869
am: eaa4e5daea

Change-Id: I99c9be77a91286ae39cfc1fac1e563c9d895612d
2017-04-18 20:59:16 +00:00
Tianjie Xu eaa4e5daea Merge "Add 'system' to update_verifier's gid" am: ba3f078f6f am: 4575986069
am: 239d154869

Change-Id: Iaaca701520690071b12c4648683b76f9e0448e6b
2017-04-18 20:52:45 +00:00