PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,471 Commits 1 Branch 0 Tags
0d853ddffd6efce857f3f762a9818d7dbc8d623c
Commit Graph

7471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi 0d853ddffd [automerger skipped] Import translations. DO NOT MERGE am: fc8af23e97 -s ours 
am: c3f22a4c2d -s ours
am skip reason: subject contains skip directive

Change-Id: I260e894a14bd59a487d3a9fd7468462994b9a379
 2019-02-16 12:17:03 -08:00
Bill Yi c3f22a4c2d [automerger skipped] Import translations. DO NOT MERGE 
am: fc8af23e97 -s ours
am skip reason: subject contains skip directive

Change-Id: I4ff4a94f634207aa24c72788a755565798782cba
 2019-02-16 12:12:05 -08:00
Bill Yi fc8af23e97 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie357c8e7a6445223a5a657cd0e96ded4689837f6
 2019-02-16 01:07:42 -08:00
Xin Li 96a0f6e570 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: c98e5d4ad1 -s ours 
am: da85ed8792 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie3e4bede38b669db2aefb24e34ba593b2862b28c
 2019-02-11 19:07:13 -08:00
Xin Li da85ed8792 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master 
am: c98e5d4ad1 -s ours
am skip reason: subject contains skip directive

Change-Id: I77aa5aa57eadffe193c21a6890749f674d38c08e
 2019-02-11 18:09:39 -08:00
Xin Li c98e5d4ad1 DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master 
Bug: 124234733
Change-Id: Ice617995cbe56d367124b3a3420a2caad300acb1
 2019-02-11 15:54:16 -08:00
android-build-team Robot 96f7786965 Snap for 5180536 from 8b508c984d to pi-platform-release 
Change-Id: I18ffadbdab03199e33f4476135b95da658880541
 2019-02-09 02:15:09 +00:00
Daniel Rosenberg fb064e7e38 Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8 am: 5837eba8ed 
am: a3c1e2052b

Change-Id: Ifdc7aa92131389e0ec2eb89aef42934016c68fce
 2019-02-07 18:18:48 -08:00
Daniel Rosenberg a3c1e2052b Merge "Defer marking boot successful when checkpointing" am: 90edbb17f8 
am: 5837eba8ed

Change-Id: I77b54d6328634b284c930a756b2dd324c2b3a493
 2019-02-07 18:01:42 -08:00
Daniel Rosenberg 5837eba8ed Merge "Defer marking boot successful when checkpointing" 
am: 90edbb17f8

Change-Id: Ic211f79ddd70dd4dcf6c7de7336d5ec98f7b46d6
 2019-02-07 17:49:46 -08:00
Daniel Rosenberg 90edbb17f8 Merge "Defer marking boot successful when checkpointing" 2019-02-08 01:40:54 +00:00
Daniel Rosenberg 15f22bddfb Defer marking boot successful when checkpointing 
This moves actually marking the slot as successful to a later point
so that on devices with checkpointing enabled we can still roll back to
the previous version if we fail to boot to the point that the checkpoint
is marked as successful.

Test: When taking an update on a checkpoint enabled device, it
      defers marking the slot as successful instead of directly
      marking it. Visible in logs.
Bug: 123260515

Change-Id: I7ed3595c1b0904ddbfe20d1cad4f69ecbf1ea351
 2019-02-07 13:26:05 -08:00
Tianjie Xu 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 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 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 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
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 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 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 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 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
Tianjie Xu 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 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 cc025b2b4a Merge "Fix potential size overflow in blockimg.cpp" 
am: 9a54dd3bf9

Change-Id: I0b19ace59a023380c2db175123f93205e3405aee
 2019-01-29 15:33:54 -08:00
Tianjie Xu 9a54dd3bf9 Merge "Fix potential size overflow in blockimg.cpp" 2019-01-29 23:08:58 +00:00
Suren Baghdasaryan 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 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 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 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 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 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 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 7548e0d6fa Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency"" 2019-01-24 06:57:55 +00:00
Ng Zhi An 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 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 a04ff295cf Merge "Check that install file exists before unlink" 
am: 05d48050c1

Change-Id: I2a216be7e2f055cc520405bd49f67c3dc18bc542
 2019-01-23 21:47:17 -08:00
Treehugger Robot 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
Suren Baghdasaryan 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 73a460b06f Merge "Add libprocessgroup dependency" am: 4475f7330a 
am: bd36c3a8ec

Change-Id: Ib573f07c3a42d2e39f805e8a7dfda03d9f01d79f
 2019-01-22 13:42:44 -08:00
Suren Baghdasaryan bd36c3a8ec Merge "Add libprocessgroup dependency" 
am: 4475f7330a

Change-Id: Ia7d2a6c5d4bfb511e6417eaf1e81f76108415c6f
 2019-01-22 13:04:21 -08:00
Suren Baghdasaryan 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
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
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 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