android-build-team Robot
d30f52153f
Snap for 5286292 from 61fd028079 to qt-release
...
Change-Id: I318d6c9fb99e83a913db9669e3529765fcac4831
2019-02-06 04:02:57 +00:00
Tianjie Xu and android-build-merger
61fd028079
Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1 am: 644e290d2d
...
am: 6c69b7515d
Change-Id: Ib00193bc8c98a365f345eb858ff7220d72dcc7d9
2019-02-05 17:15:15 -08:00
Tianjie Xu and android-build-merger
6c69b7515d
Merge "Recovery test: Fix an parameter issue in string construction" am: e13b39bbb1
...
am: 644e290d2d
Change-Id: Ib79a95d6a727ff9eb7af56ef9b6cda69c5f1dd99
2019-02-05 17:11:14 -08:00
Tianjie Xu and android-build-merger
644e290d2d
Merge "Recovery test: Fix an parameter issue in string construction"
...
am: e13b39bbb1
Change-Id: I4cafef20f443adc11776587028b176dfcb75becd
2019-02-05 17:07:13 -08:00
Tianjie Xu and Gerrit Code Review
e13b39bbb1
Merge "Recovery test: Fix an parameter issue in string construction"
2019-02-06 00:53:25 +00:00
xunchang
7b08a5a6eb
Recovery test: Fix an parameter issue in string construction
...
The intended string constructor is supposed be
basic_string(size_type count, CharT ch). But the parameter is
accidentally reversed when calling the constructor in install_test.
Test: A failed unit test pass
Change-Id: Id9765bfa7d2368ff0d7fbeea45c9c8357864e060
2019-02-05 12:44:53 -08:00
android-build-team Robot
6417eb785d
Snap for 5280121 from 25bfb1bea9 to qt-release
...
Change-Id: I9fc286f14bc4cdb6777c5bb9daf930c632cc1d6d
2019-02-03 04:07:33 +00:00
Bill Yi
25bfb1bea9
Import translations. DO NOT MERGE
...
Change-Id: Id46b7b2d7bf8f9fe1edd9bb90cc0e3d279f3472c
Auto-generated-cl: translation import
2019-02-01 21:22:54 -08:00
Tom Cherry and android-build-merger
0be4406e3c
Merge "Add android::fs_mgr namespace for new Fstab code" am: 990807a95f am: 9594188eea
...
am: 5217b136a6
Change-Id: I3e79fc9c02a1fa39c8502df587619a6a47334559
2019-01-31 12:22:29 -08:00
Tom Cherry and android-build-merger
5217b136a6
Merge "Add android::fs_mgr namespace for new Fstab code" am: 990807a95f
...
am: 9594188eea
Change-Id: I2e51f997a0c362fa93ac1990b05fda86bf063522
2019-01-31 12:05:27 -08:00
Tom Cherry and android-build-merger
9594188eea
Merge "Add android::fs_mgr namespace for new Fstab code"
...
am: 990807a95f
Change-Id: I215dd9dd7336953f65abbde5a0b8ef47b6407326
2019-01-31 11:50:09 -08:00
Tom Cherry and Gerrit Code Review
990807a95f
Merge "Add android::fs_mgr namespace for new Fstab code"
2019-01-31 19:35:54 +00:00
Tom Cherry
72a114a3e1
Add android::fs_mgr namespace for new Fstab code
...
Also add libfstab dependencies where needed. Previously the
`typedef struct FstabEntry Volume;` line served to both define a
`struct FstabEntry` as well as alias Volume to it. With the new
namespace for android::fs_mgr::FstabEntry, `struct FstabEntry` isn't
compatible anymore, so we need to alias Volume to the real
android::fs_mgr::FstabEntry.
In doing so, we need to include <fstab/fstab.h> and this requires
libfstab as a library, which a few modules did not have before.
Test: treehugger
Change-Id: I655209a0efb304b3e0568db0748bd5cf7cecbdb7
2019-01-31 09:00:40 -08:00
android-build-team Robot
be03d7eca6
Snap for 5268116 from 89b92c1217 to qt-release
...
Change-Id: I04f6b527ae850dafe4be968e5d3d47be7e8686c2
2019-01-30 04:13:20 +00:00
Tianjie Xu and android-build-merger
89b92c1217
Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9 am: cc025b2b4a
...
am: d8063b0af4
Change-Id: I2c8fd5c1984f20157e8cbda07b476d0d6de458d7
2019-01-29 16:07:52 -08:00
Tianjie Xu and android-build-merger
d8063b0af4
Merge "Fix potential size overflow in blockimg.cpp" am: 9a54dd3bf9
...
am: cc025b2b4a
Change-Id: Iba39c6bd6e4e0b4e0576f7b82662439794b1d2fc
2019-01-29 15:52:19 -08:00
Tianjie Xu and android-build-merger
cc025b2b4a
Merge "Fix potential size overflow in blockimg.cpp"
...
am: 9a54dd3bf9
Change-Id: I0b19ace59a023380c2db175123f93205e3405aee
2019-01-29 15:33:54 -08:00
Tianjie Xu and Gerrit Code Review
9a54dd3bf9
Merge "Fix potential size overflow in blockimg.cpp"
2019-01-29 23:08:58 +00:00
android-build-team Robot
cdc115be5e
Snap for 5262136 from 794b981823 to qt-release
...
Change-Id: Ibb0478a68322fa4461812da6b918804bf1c0f263
2019-01-27 04:11:30 +00:00
Suren Baghdasaryan and android-build-merger
794b981823
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""" am: 5342de92e0 -s ours am: 2b8e48240e -s ours
...
am: 61130815a1 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifd3004be0ccab309fbd241f127c74d44edd3a2ff
2019-01-25 09:40:04 -08:00
Suren Baghdasaryan and android-build-merger
61130815a1
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""" am: 5342de92e0 -s ours
...
am: 2b8e48240e -s ours
am skip reason: subject contains skip directive
Change-Id: I032c0d13df8e02ba2ee52616d32c0a0066dc79e7
2019-01-25 09:28:07 -08:00
Suren Baghdasaryan and android-build-merger
2b8e48240e
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency"""
...
am: 5342de92e0 -s ours
am skip reason: subject contains skip directive
Change-Id: I27e126950c7a76f473e5450451e12d36eaa92ad5
2019-01-25 09:18:11 -08:00
Suren Baghdasaryan and Gerrit Code Review
5342de92e0
Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency"""
2019-01-25 17:09:02 +00:00
Suren Baghdasaryan
0ca607c4cd
DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency""
...
This reverts commit 9ce1d14ef6 .
Reason for revert: AOSP is fixed with new vendor image
Change-Id: Ie5a9748acdae22a2b9862cb2ecedda7031f77264
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-25 05:43:59 +00:00
Suren Baghdasaryan and android-build-merger
985070ed98
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" am: 7548e0d6fa -s ours am: 56d6cf2c94 -s ours
...
am: d631ac484d -s ours
am skip reason: subject contains skip directive
Change-Id: Iae08ba2a67f9ce5804a819e6b3ae84c0ce3ced8d
2019-01-23 23:27:19 -08:00
Suren Baghdasaryan and android-build-merger
d631ac484d
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" am: 7548e0d6fa -s ours
...
am: 56d6cf2c94 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifbbd4ba3de9c9f7725cd4a2232df9c83be09686b
2019-01-23 23:14:43 -08:00
Suren Baghdasaryan and android-build-merger
56d6cf2c94
[automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""
...
am: 7548e0d6fa -s ours
am skip reason: subject contains skip directive
Change-Id: I6ccebe2066001865d5d57b3e11f8b72827fd4e4d
2019-01-23 23:05:33 -08:00
Suren Baghdasaryan and Gerrit Code Review
7548e0d6fa
Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency""
2019-01-24 06:57:55 +00:00
Ng Zhi An and android-build-merger
3de293f4a2
Merge "Check that install file exists before unlink" am: 05d48050c1 am: a04ff295cf
...
am: 737e6cc600
Change-Id: I5c6e484133c16e472941c81b63ef0f7e78e4f71b
2019-01-23 21:58:18 -08:00
Ng Zhi An and android-build-merger
737e6cc600
Merge "Check that install file exists before unlink" am: 05d48050c1
...
am: a04ff295cf
Change-Id: I00c9323e3c774f25d4c746e439d8c50bb75935b6
2019-01-23 21:54:11 -08:00
Ng Zhi An and android-build-merger
a04ff295cf
Merge "Check that install file exists before unlink"
...
am: 05d48050c1
Change-Id: I2a216be7e2f055cc520405bd49f67c3dc18bc542
2019-01-23 21:47:17 -08:00
Treehugger Robot and Gerrit Code Review
05d48050c1
Merge "Check that install file exists before unlink"
2019-01-24 05:35:51 +00:00
Suren Baghdasaryan
9ce1d14ef6
DO NOT MERGE: Revert "Add libprocessgroup dependency"
...
This reverts commit 62d0c7873c .
Reason for revert: Broke AOSP
Change-Id: I88ef00ebce797f7fdca3678ab93fcae364453a8c
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-23 20:46:46 -08:00
Ng Zhi An
14417a5d2a
Check that install file exists before unlink
...
This will remove spurious error messages in logcat such as:
08-02 00:27:21.580 600 600 E /system/bin/recovery-persist: Failed to
unlink /data/misc/recovery/last_install: No such file or directory
since the install file doesn't exist in the first place.
Bug: None
Test: m
Change-Id: Ifaa95729c50efae4e641286dfbe1718aceb5f50a
2019-01-23 15:16:29 -08:00
android-build-team Robot
ea43f13236
Snap for 5251505 from 734dd91a48 to qt-release
...
Change-Id: I8a853361f274ac0b6c482408926e19cfb61e5698
2019-01-23 04:07:17 +00:00
Suren Baghdasaryan and android-build-merger
734dd91a48
[automerger skipped] Merge "Add libprocessgroup dependency" am: 4475f7330a am: bd36c3a8ec
...
am: 73a460b06f -s ours
am skip reason: change_id I7cf75e473ee1e2837940606c71d15be26db0c3f2 with SHA1 79f4680e4d is in history
Change-Id: Iac56fd9de1905a5e224ff883dc98e9a4cd831d9e
2019-01-22 14:08:40 -08:00
Suren Baghdasaryan and android-build-merger
73a460b06f
Merge "Add libprocessgroup dependency" am: 4475f7330a
...
am: bd36c3a8ec
Change-Id: Ib573f07c3a42d2e39f805e8a7dfda03d9f01d79f
2019-01-22 13:42:44 -08:00
Suren Baghdasaryan and android-build-merger
bd36c3a8ec
Merge "Add libprocessgroup dependency"
...
am: 4475f7330a
Change-Id: Ia7d2a6c5d4bfb511e6417eaf1e81f76108415c6f
2019-01-22 13:04:21 -08:00
Suren Baghdasaryan and Gerrit Code Review
4475f7330a
Merge "Add libprocessgroup dependency"
2019-01-22 20:58:15 +00:00
Suren Baghdasaryan
62d0c7873c
Add libprocessgroup dependency
...
Because set_sched_policy is moved into libprocessgroup an additional
dependency is requred for recovery_component_test to build.
Exempt-From-Owner-Approval: janitorial
Bug: 111307099
Test: builds, boots
Merged-In: I7cf75e473ee1e2837940606c71d15be26db0c3f2
Change-Id: I7cf75e473ee1e2837940606c71d15be26db0c3f2
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-20 22:04:43 +00:00
android-build-team Robot
0f29f2dd9f
Snap for 5246489 from 79f4680e4d to qt-release
...
Change-Id: I69685ebd04425ff3fbecbc7198e4fb718eb03deb
2019-01-20 04:19:11 +00:00
xunchang
53158e51d0
Fix potential size overflow in blockimg.cpp
...
Switch to 64 bit integers since the size of the entire src/tgt images may
not fit in size_t of ILP32.
There are other theoretical overflow cases in memory allocation and I/O
functions. However, they reside within a single transfer command and are
less likely to happen. I will evaluate and address them in separate
cls.
Test: unit tests pass
Bug: 122461124
Change-Id: Ib719ee695920877458fcfaa25c6ac058a5bbabf2
2019-01-17 09:26:12 -08:00
android-build-team Robot
f9b3924ffb
Snap for 5240105 from 2f216f3993 to qt-release
...
Change-Id: Iffc8e0b10120c7f329e85e8f0dd3d727c817d86d
2019-01-17 17:05:08 +00:00
Suren Baghdasaryan
79f4680e4d
Add libprocessgroup dependency
...
Because set_sched_policy is moved into libprocessgroup an additional
dependency is requred for recovery_component_test to build.
Exempt-From-Owner-Approval: janitorial
Bug: 111307099
Test: builds, boots
Change-Id: I7cf75e473ee1e2837940606c71d15be26db0c3f2
Signed-off-by: Suren Baghdasaryan <surenb@google.com >
2019-01-17 02:42:38 +00:00
Hridya Valsaraju and android-build-merger
2f216f3993
Merge "e2fsck_static is no longer needed for remount" am: 725d7f8dfd am: f1fd5ec266
...
am: 5792ea8690
Change-Id: I2068f1c6a029c31d86415ab98a42b588d7bde68d
2019-01-16 18:35:14 -08:00
Hridya Valsaraju and android-build-merger
5792ea8690
Merge "e2fsck_static is no longer needed for remount" am: 725d7f8dfd
...
am: f1fd5ec266
Change-Id: I8593bdf9366e72bc165117fc1fe8414567984661
2019-01-16 18:02:46 -08:00
Hridya Valsaraju and android-build-merger
f1fd5ec266
Merge "e2fsck_static is no longer needed for remount"
...
am: 725d7f8dfd
Change-Id: Ie67ab328d10aebd078a1a41fe48b79f6d4467ebe
2019-01-16 17:58:41 -08:00
Treehugger Robot and Gerrit Code Review
725d7f8dfd
Merge "e2fsck_static is no longer needed for remount"
2019-01-17 01:43:33 +00:00
Hridya Valsaraju
6f44c11357
e2fsck_static is no longer needed for remount
...
Remount will instead use overlayfs. If the device is not configured
to use overlayfs or if the device does not support dynamic partitions
but has chosed to setup an ext4-dedupe filesystem, e2fsck_static must
then be included in recovery.
Bug: 122115286
Test: fastboot flashall
Change-Id: I931282dbc67ff4ef53291bcbc5a078b500e5e807
2019-01-16 23:42:55 +00:00
Tao Bao and android-build-merger
a70556178e
Merge "screen_ui: Trivial fix to append newline when logging." am: 594a63cc9d am: fadc163b60
...
am: 8df7ff0026
Change-Id: I7ac89722d144556e5b52b2d0f40d80682ae63a6a
2019-01-16 15:41:55 -08:00