Tao Bao and android-build-merger
0813c01c8b
Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2 am: f2726712ea
...
am: c36b919525
2016-03-04 20:32:45 +00:00
Tao Bao and android-build-merger
558a1942c5
Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51 am: 038c294453
...
am: d29a16afc7
2016-03-04 20:32:38 +00:00
Tao Bao and android-build-merger
c36b919525
Merge "recovery: Handle devices without /cache partition." am: 479d9dc2f2
...
am: f2726712ea
2016-03-04 20:28:38 +00:00
Tao Bao and android-build-merger
d29a16afc7
Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." am: f639490a51
...
am: 038c294453
2016-03-04 20:28:30 +00:00
Tao Bao and android-build-merger
f2726712ea
Merge "recovery: Handle devices without /cache partition."
...
am: 479d9dc2f2
2016-03-04 20:26:06 +00:00
Tao Bao and android-build-merger
038c294453
Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES."
...
am: f639490a51
2016-03-04 20:25:59 +00:00
Tao Bao and Gerrit Code Review
479d9dc2f2
Merge "recovery: Handle devices without /cache partition."
2016-03-04 20:17:11 +00:00
Tao Bao and Gerrit Code Review
f639490a51
Merge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES."
2016-03-04 20:16:50 +00:00
Alex Deymo and android-build-merger
2bdef0937a
Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6 am: f6ffefb116
...
am: 20bb31bbd3
2016-03-04 05:49:06 +00:00
Alex Deymo and android-build-merger
20bb31bbd3
Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6
...
am: f6ffefb116
2016-03-04 05:47:16 +00:00
Alex Deymo and android-build-merger
f6ffefb116
Merge "Restore labels on /postinstall during recovery."
...
am: 60eae72ac6
2016-03-04 05:45:27 +00:00
Alex Deymo and Gerrit Code Review
60eae72ac6
Merge "Restore labels on /postinstall during recovery."
2016-03-04 05:40:14 +00:00
Tao Bao and android-build-merger
d79baad222
uncrypt: Communicate via /dev/socket/uncrypt. am: 3a2bb594df
...
am: 21c0054766
2016-03-04 01:26:59 +00:00
Tao Bao and android-build-merger
21c0054766
uncrypt: Communicate via /dev/socket/uncrypt.
...
am: 3a2bb594df
2016-03-04 01:00:53 +00:00
Tao Bao
d80a99883d
Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.
...
If two libraries both use LOCAL_WHOLE_STATIC_LIBRARIES and include a same
library, there would be linking errors when generating a shared library
(or executable) that depends on the two libraries both.
Also clean up Android.mk files.
Remove the "LOCAL_MODULE_TAGS := eng" line for the updater module. The
module will then default to "optional" which won't be built until needed.
Change-Id: I3ec227109b8aa744b7568e7f82f575aae3fe0e6f
2016-03-03 14:52:44 -08:00
Tao Bao
3a2bb594df
uncrypt: Communicate via /dev/socket/uncrypt.
...
We used to rely on files (e.g. /cache/recovery/command and
/cache/recovery/uncrypt_status) to communicate between uncrypt and its
caller (i.e. system_server). Since A/B devices may not have /cache
partitions anymore, we switch to socket communication instead.
We will keep the use of /cache/recovery/uncrypt_file to indicate the OTA
package to be uncrypt'd though. Because there is existing logic in
ShutdownThread.java that depends on the existence of the file to
detect pending uncrypt works. This part won't affect A/B devices without
/cache partitions, because such devices won't need uncrypt service (i.e
the real de-encrypt work) anyway.
Bug: 27176738
Change-Id: I481406e09e3ffc7b80f2c9e39003b9fca028742e
2016-03-02 23:23:32 -08:00
Tao Bao
26112e5870
recovery: Handle devices without /cache partition.
...
Since we may not have /cache partition on A/B devices, let recovery
handle /cache related operations gracefully if /cache doesn't exist.
(1) Disable the wipe for /cache partition.
(2) Skip wiping /cache while wiping /data (i.e. factory reset).
(3) Disable logging-related features, until we figure out better
ways / places to store recovery logs (mainly for factory resets on A/B
devices).
Bug: 27176738
Change-Id: I7b14e53ce18960fe801ddfc15380dac6ceef1198
2016-03-02 15:33:32 -08:00
Alex Deymo
6bcc8af6e5
Restore labels on /postinstall during recovery.
...
This patch mirrors what was done in the main init.rc to relabel
/postinstall.
Bug: 27178350
Bug: 27177071
Change-Id: I39cd03f3c55a42c03367957e8c259c9a3155203c
2016-03-02 14:35:51 -08:00
Mattias Nissler and android-build-merger
4934bb7e85
Merge "Remove dumpkey build guards after completing code move." am: 5ffc038be6 am: ea0e0faae6
...
am: c4d143356e
2016-03-01 16:42:22 +00:00
Mattias Nissler and android-build-merger
c4d143356e
Merge "Remove dumpkey build guards after completing code move." am: 5ffc038be6
...
am: ea0e0faae6
2016-03-01 16:38:50 +00:00
Mattias Nissler and android-build-merger
ea0e0faae6
Merge "Remove dumpkey build guards after completing code move."
...
am: 5ffc038be6
2016-03-01 11:48:54 +00:00
Mattias Nissler and Gerrit Code Review
5ffc038be6
Merge "Remove dumpkey build guards after completing code move."
2016-03-01 11:46:27 +00:00
Prashant Malani and android-build-merger
08bae03c94
Merge "Fixes to wear recovery for N" into nyc-dev am: 9db7964834
...
am: 30f368fde0
2016-02-29 23:02:44 +00:00
Prashant Malani and android-build-merger
30f368fde0
Merge "Fixes to wear recovery for N" into nyc-dev
...
am: 9db7964834
2016-02-29 22:59:30 +00:00
Prashant Malani and Android (Google) Code Review
9db7964834
Merge "Fixes to wear recovery for N" into nyc-dev
2016-02-29 22:56:30 +00:00
Tao Bao and android-build-merger
4d88a5d8f4
Merge "uncrypt: Retire pre-recovery service." into nyc-dev am: 65f35b5c35
...
am: bc11dd8b7c
2016-02-28 18:47:55 +00:00
Tao Bao and android-build-merger
bc11dd8b7c
Merge "uncrypt: Retire pre-recovery service." into nyc-dev
...
am: 65f35b5c35
2016-02-28 18:46:29 +00:00
Tao Bao and Android (Google) Code Review
65f35b5c35
Merge "uncrypt: Retire pre-recovery service." into nyc-dev
2016-02-28 18:44:38 +00:00
Prashant Malani
0eb41c3f37
Fixes to wear recovery for N
...
Bug: 27336841
Change-Id: If4632e9791cce2c39590a4012687271f59a60af1
2016-02-26 17:01:37 -08:00
Mattias Nissler
b66f047d41
Remove dumpkey build guards after completing code move.
...
Bug: 27326256
Change-Id: Ia713b23e3c898c1f10af7c61ea67f34601fdcbe3
2016-02-26 11:20:18 +01:00
Mattias Nissler and android-build-merger
25fb74bc83
Merge "Move dumpkey tool to the recovery repo." am: 5197fde242 am: b652678953
...
am: 95b96d98ca
2016-02-26 08:22:01 +00:00
Mattias Nissler and android-build-merger
95b96d98ca
Merge "Move dumpkey tool to the recovery repo." am: 5197fde242
...
am: b652678953
2016-02-26 08:19:34 +00:00
Mattias Nissler and android-build-merger
b652678953
Merge "Move dumpkey tool to the recovery repo."
...
am: 5197fde242
2016-02-26 08:18:02 +00:00
Mattias Nissler and Gerrit Code Review
5197fde242
Merge "Move dumpkey tool to the recovery repo."
2016-02-26 08:16:34 +00:00
Paul Lawrence and android-build-merger
e048f0ba7f
Move recovery\'s convert_fbe folder to /tmp am: 661f8a69f2
...
am: 8c3922f4ab
2016-02-25 21:45:00 +00:00
Paul Lawrence and android-build-merger
8c3922f4ab
Move recovery\'s convert_fbe folder to /tmp
...
am: 661f8a69f2
2016-02-25 21:37:01 +00:00
Paul Lawrence
661f8a69f2
Move recovery's convert_fbe folder to /tmp
...
The cache folder is no longer available at this time
Bug: 27355824
Change-Id: I74e33266c1ff407364981b186613f81319dd22dc
2016-02-25 13:07:16 -08:00
Mattias Nissler
03b72b0f37
Move dumpkey tool to the recovery repo.
...
The dumpkey tool is used to dump encryption keys in a custom format
used by the recovery code. Nobody else uses this format AFAICT, so
it's more appropriate to keep the code of the tool alongside the
recovery code instead of next to mincrypt.
BUG:27326256
Change-Id: I30176845617972be1d6e46e9a9218e161fbf0680
2016-02-24 14:53:10 +01:00
Josh Gao and android-build-merger
61d1bd7156
Merge "minadbd: update for adb_thread_create signature change." into nyc-dev am: 0757a093c1
...
am: 744284bea0
2016-02-24 01:00:20 +00:00
Josh Gao and android-build-merger
744284bea0
Merge "minadbd: update for adb_thread_create signature change." into nyc-dev
...
am: 0757a093c1
2016-02-24 00:53:17 +00:00
Josh Gao and Android (Google) Code Review
0757a093c1
Merge "minadbd: update for adb_thread_create signature change." into nyc-dev
2016-02-24 00:50:36 +00:00
Yabin Cui and android-build-merger
8cb6069499
recovery: check battery level before installing package. am: 99281df8e2
...
am: 2be10be7d0
2016-02-23 23:13:56 +00:00
Yabin Cui and android-build-merger
2be10be7d0
recovery: check battery level before installing package.
...
am: 99281df8e2
2016-02-23 23:00:48 +00:00
Tianjie Xu and android-build-merger
90c75ddc05
Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702 am: 0d63468171
...
am: cc5372006f
2016-02-23 19:38:05 +00:00
Tianjie Xu and android-build-merger
cc5372006f
Merge "Surpress warnings in minzip/Zip.c" am: 4b3cdce702
...
am: 0d63468171
2016-02-23 19:30:13 +00:00
Tianjie Xu and android-build-merger
0d63468171
Merge "Surpress warnings in minzip/Zip.c"
...
am: 4b3cdce702
2016-02-23 19:25:11 +00:00
Tianjie Xu and Gerrit Code Review
4b3cdce702
Merge "Surpress warnings in minzip/Zip.c"
2016-02-23 19:16:42 +00:00
Tianjie Xu
6629655476
Surpress warnings in minzip/Zip.c
...
bootable/recovery/minzip/Zip.c:514:5: warning: Value stored to 'compRemaining' is never read
compRemaining = pEntry->compLen;
^ ~~~~~~~~~~~~~~~
bootable/recovery/minzip/Zip.c:778:9: warning: Null pointer argument in call to memory copy function
memcpy(p, helper->targetDir, helper->targetDirLen);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Bug: 27229894
Change-Id: I0482bac3a4fcddc191783d1e5b5a83cf29fa4e85
2016-02-23 11:15:43 -08:00
Yabin Cui
99281df8e2
recovery: check battery level before installing package.
...
Bug: 26879394
Change-Id: I63dce5bc50c2e104129f1bcab7d3cad5682bf45d
(cherry picked from commit 53e7a0628f
2016-02-23 11:03:10 -08:00
Yabin Cui and android-build-merger
fc993df953
Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a am: f4ee1720f3 am: cae056f219 am: 682d691052 am: ae68f02272 am: a3604da6e1 am: 089fe38ac5
...
am: 71c06eb1f7
2016-02-23 07:01:59 +00:00
