d33efb0320
Snap for 5434517 from 7df2da5948 to qt-release
...
Change-Id: Id696f3ae6bf939e75921169db48a36b428188add
2019-04-04 03:03:57 +00:00
7df2da5948
Merge master@5428150 into git_qt-dev-plus-aosp.
...
am: 86de943dcc
2019-04-03 17:20:26 -07:00
549321c723
Merge master@5406228 into git_qt-dev-plus-aosp.
...
am: 74253cca39
2019-04-03 16:11:09 -07:00
b230799046
Snap for 5430508 from 53cbda8056 to qt-release
...
Change-Id: Ibb618dcb397138d646ee4a717c753fb9c9070bb0
2019-04-03 03:10:23 +00:00
53cbda8056
Merge "Append -verity when looking for verity device-mapper names." am: bc2eab4315 am: 9a53189ae5
...
am: 5fa37b77d1
2019-04-02 15:09:14 -07:00
5fa37b77d1
Merge "Append -verity when looking for verity device-mapper names." am: bc2eab4315
...
am: 9a53189ae5
2019-04-02 14:08:44 -07:00
9a53189ae5
Merge "Append -verity when looking for verity device-mapper names."
...
am: bc2eab4315
2019-04-02 14:04:49 -07:00
bc2eab4315
Merge "Append -verity when looking for verity device-mapper names."
2019-04-02 20:16:36 +00:00
86de943dcc
Merge master@5428150 into git_qt-dev-plus-aosp.
...
Change-Id: I1c69d7c91e68fd4baba7b6510acf2a69e1a6c5d7
BUG: 129345239
2019-04-02 18:26:46 +00:00
c52663c4ea
Append -verity when looking for verity device-mapper names.
...
Bug: 123666267
Test: recovery_component_test passes
Change-Id: I9b608b3fbfa14cc45ad0b4de6cb5cecdef983acb
2019-04-01 17:13:11 -07:00
f50ec3b61e
Snap for 5422062 from 1055819fa8 to qt-release
...
Change-Id: I5be91ae8b7bbf2f21974df9cc55c61fefa60ea68
2019-03-30 23:30:35 +00:00
1055819fa8
Merge changes Ibbe7084e,If584fc8a am: bb8f0fff17 am: effd4ca883
...
am: 64ec642955
2019-03-30 08:41:12 -07:00
64ec642955
Merge changes Ibbe7084e,If584fc8a am: bb8f0fff17
...
am: effd4ca883
2019-03-30 08:37:12 -07:00
effd4ca883
Merge changes Ibbe7084e,If584fc8a
...
am: bb8f0fff17
2019-03-30 08:33:15 -07:00
bb8f0fff17
Merge changes Ibbe7084e,If584fc8a
...
* changes:
recovery: Remove SetUsbConfig() out of common.h.
Remove ui_print().
2019-03-30 15:18:18 +00:00
e0cfab3de9
recovery: Remove SetUsbConfig() out of common.h.
...
libinstall now has its own copy.
Test: mmma -j bootable/recovery
Change-Id: Ibbe7084e15baeb7e744f2175d5944477092acc9e
2019-03-29 15:54:02 -07:00
bc982a4f88
Remove ui_print().
...
This used to be a helper function that allows printing message to UI.
We no longer have any active user in bootable/recovery. Device-specific
code can achieve the same functionality by calling GetUI()->Print()
instead.
Test: mmma -j bootable/recovery
Change-Id: If584fc8a51d1af466f1d94d8ea5faa262603a784
2019-03-29 15:50:02 -07:00
8e39f3d54e
Merge "Move install to separate module" am: a232d9dccb am: 3f25d6bb07
...
am: 719c7edd2a
2019-03-29 15:04:04 -07:00
719c7edd2a
Merge "Move install to separate module" am: a232d9dccb
...
am: 3f25d6bb07
2019-03-29 14:54:00 -07:00
3f25d6bb07
Merge "Move install to separate module"
...
am: a232d9dccb
2019-03-29 14:43:56 -07:00
a232d9dccb
Merge "Move install to separate module"
2019-03-29 21:23:49 +00:00
2478885f3c
Move install to separate module
...
Build libinstall as a shared library. Also drop the dependency on the
global variables in common.h.
Test: unit tests pass, sideload an OTA
Change-Id: I30a20047768ce00689fc0e7851c1c5d712a365a0
2019-03-29 10:27:51 -07:00
575fc7ec07
Merge "Use flags = 0 to avoid fd closing for child updater process" am: 50bda24f1e am: 111663d893
...
am: 2796a9d00f
2019-03-29 06:57:42 -07:00
2796a9d00f
Merge "Use flags = 0 to avoid fd closing for child updater process" am: 50bda24f1e
...
am: 111663d893
2019-03-29 06:53:41 -07:00
111663d893
Merge "Use flags = 0 to avoid fd closing for child updater process"
...
am: 50bda24f1e
2019-03-29 06:49:40 -07:00
50bda24f1e
Merge "Use flags = 0 to avoid fd closing for child updater process"
2019-03-29 13:41:40 +00:00
2cc882c2f8
Merge "Fix bogus error checking on unique_fd" am: a0fe1227b8 am: 7367caad0f
...
am: 5e028e80cf
2019-03-28 21:30:50 -07:00
5e028e80cf
Merge "Fix bogus error checking on unique_fd" am: a0fe1227b8
...
am: 7367caad0f
2019-03-28 21:14:37 -07:00
74253cca39
Merge master@5406228 into git_qt-dev-plus-aosp.
...
Change-Id: I1091bf4ecb36441bec7651e20222b4d34c69a443
BUG: 129345239
2019-03-29 04:13:21 +00:00
7367caad0f
Merge "Fix bogus error checking on unique_fd"
...
am: a0fe1227b8
2019-03-28 21:08:33 -07:00
a0fe1227b8
Merge "Fix bogus error checking on unique_fd"
2019-03-29 03:52:46 +00:00
08ba1ad9b1
Use flags = 0 to avoid fd closing for child updater process
...
If we use the default parameter we'll get O_CLOEXEC, which will close the fd
that we pass to the child process, which will cause it to fail. Passing zero
avoids the problem.
Bug: 122813742
Test: Verify that non-A/B OTA update is successful.
Change-Id: Ia61bc7260f17d9209715583e6ded69e1196ed3f6
2019-03-28 18:42:13 -07:00
8c9e2206b8
Merge "Remove the extern declaration of sehandle from roots.cpp." am: 047582b506 am: 9e23616e2e
...
am: a799e66faa
2019-03-28 09:27:30 -07:00
a799e66faa
Merge "Remove the extern declaration of sehandle from roots.cpp." am: 047582b506
...
am: 9e23616e2e
2019-03-28 09:18:55 -07:00
9e23616e2e
Merge "Remove the extern declaration of sehandle from roots.cpp."
...
am: 047582b506
2019-03-28 09:14:50 -07:00
047582b506
Merge "Remove the extern declaration of sehandle from roots.cpp."
2019-03-28 15:49:44 +00:00
8bd6f455d2
Fix bogus error checking on unique_fd
...
The expression "!fd" calls the implicit conversion to int, but comparing
the raw fd against 0 does not work, since open() and other POSIX calls
returning a file descriptor use -1 to signal an error.
Test: m recovery
Change-Id: I0847c276f39cb9dd09c7ffb96951276113418fc8
2019-03-28 17:28:13 +09:00
fd7d835fd9
Remove the extern declaration of sehandle from roots.cpp.
...
It has become obsolete since we replaced the call to make_ext4 with
e2fsprogs (commit ded2dac082
2019-03-27 23:29:38 -07:00
aa089c0fd1
Snap for 5413448 from e7dd308591 to qt-release
...
Change-Id: I57df69ce2654619718e786527b91924729610716
2019-03-28 03:02:57 +00:00
e7dd308591
Merge "Allow RSA 4096 key in package verification" am: 3168ddf79d am: 3de9ee62b8
...
am: 66afbbd536
2019-03-27 11:32:26 -07:00
66afbbd536
Merge "Allow RSA 4096 key in package verification" am: 3168ddf79d
...
am: 3de9ee62b8
2019-03-27 11:24:07 -07:00
3de9ee62b8
Merge "Allow RSA 4096 key in package verification"
...
am: 3168ddf79d
2019-03-27 11:21:01 -07:00
3168ddf79d
Merge "Allow RSA 4096 key in package verification"
2019-03-27 17:57:38 +00:00
385e9fc5b8
Snap for 5409551 from 4c3d68f7c8 to qt-release
...
Change-Id: I51076db32cb42a9885f33039a793a0ede3a815bd
2019-03-27 03:05:50 +00:00
4c3d68f7c8
Merge "Move out the code to parse block map in MemMap" am: f1cbd2f7f2 am: 67a3ffc22f
...
am: 0a6518b79b
2019-03-26 17:37:16 -07:00
0a6518b79b
Merge "Move out the code to parse block map in MemMap" am: f1cbd2f7f2
...
am: 67a3ffc22f
2019-03-26 17:05:40 -07:00
67a3ffc22f
Merge "Move out the code to parse block map in MemMap"
...
am: f1cbd2f7f2
2019-03-26 16:09:33 -07:00
f1cbd2f7f2
Merge "Move out the code to parse block map in MemMap"
2019-03-26 21:52:40 +00:00
908ad77af8
Allow RSA 4096 key in package verification
...
The RSA_verify sitll works for 4096 bits keys. And we just
need to loose the check on modulus.
Sample commands to generate the key & package:
1. openssl genrsa -out keypair.pem 4096
2. openssl pkcs8 -topk8 -inform PEM -outform DER -nocrypt \
-in keypair.pem -out private.pk8
3. openssl req -new -x509 -key keypair.pem -out public.x509.pem \
-days 365
4. java -Djava.library.path=prebuilts/sdk/tools/linux/lib64 -jar \
prebuilts/sdk/tools/lib/signapk.jar -w public.x509.pem private.pk8 \
unsigned.zip signed.zip
Bug: 129163830
Test: unit tests pass
Change-Id: I5a5ff539c9ff1955c02ec2ce4b17563cb92808a4
2019-03-26 12:28:23 -07:00
625c588c0f
Move out the code to parse block map in MemMap
...
We will reuse them to implement the fuse provider from block maps.
Test: unit tests pass, sideload an OTA
Change-Id: Iaa409d19569c4ccc0bb24e12518044fcddb45c69
2019-03-26 11:47:27 -07:00
android-build-team Robot
Bill Rassieur
David Anderson
Tao Bao
Tianjie Xu
Bill Peckham
Bernie Innocenti
Treehugger Robot