github.com/PitchBlackRecoveryProject/android_system_vold commits

[automerger skipped] Fix crash in mainline

am: 1b535e41fd -s ours
am skip reason: change_id I135099625f77344d1f8d2e8688735871c44ef2f5 with S...

315855b541886772eb0e6f21a77273c26bb67947 authored over 5 years ago

Fix crash in mainline

Current behavior:

Assume not checkpointing
cp_startCheckpoint creates the file in metadata
cp_n...

1b535e41fd6c1b666cf806aae782cf621b7782bc authored over 5 years ago

[automerger skipped] Create a per-boot key on each boot am: ccc84dec96 -s ours

am: a7e15f91ac -s ours
am skip reason: change_id I74077bf8f727dab726c25f512ed7406a74cbe0bf with S...

f4686ea633adeb14c93038e0dc3dc8599ea73511 authored over 5 years ago

[automerger skipped] Create a per-boot key on each boot

am: ccc84dec96 -s ours
am skip reason: change_id I74077bf8f727dab726c25f512ed7406a74cbe0bf with S...

a7e15f91ac4dbe3058ae0d0863aca3ee76b6606b authored over 5 years ago

Create a per-boot key on each boot

Bug: 140882488
Test: Booted twice, checked logs to ensure encryption
is different each time,...

ccc84dec9613ee9c8fdbd734fc6bd58052a8336f authored over 5 years ago

Merge "Create a per-boot key on each boot" am: dab5ddf663 am: 6db7fa72a5 am: 03336816a7

am: d678142ac6

Change-Id: I7ab21b901ac8fd8a746f7190a340c518e099a48a

a1c405a8f2778d655776244916df9f8d2fca3838 authored over 5 years ago

Merge "Create a per-boot key on each boot" am: dab5ddf663 am: 6db7fa72a5

am: 03336816a7

Change-Id: I79b13f2fa4c002d5242a5d498ec5db385b7199bd

d678142ac694ab753bc8dfa22b3682c3cace1b3e authored over 5 years ago

Merge "Create a per-boot key on each boot" am: dab5ddf663

am: 6db7fa72a5

Change-Id: I2543c7cd24fcdbd13b08e9afc4d1e0a448dc3373

03336816a79885b46c0d39fde8ba0516dbfbb789 authored over 5 years ago

Merge "Create a per-boot key on each boot"

am: dab5ddf663

Change-Id: Iee4dabdcccedcbf652ae23edb4d20404947a765c

6db7fa72a53930dde4de7653b016edba66d569c3 authored over 5 years ago

Merge "Create a per-boot key on each boot"

dab5ddf663bc0f9b16c789b4ae8b76c15c87a9ac authored over 5 years ago

Merge "vold: use system-clang-format" am: 7e65d8dd00 am: c302876a95 am: acafcd49a8

am: 81adf14c15

Change-Id: Ic9f18b013f5bd332c9b1061450b1b3932ff229c4

31858e2e722e657fcf0d98326ef11fa30667c7f8 authored over 5 years ago

Merge "vold: use system-clang-format" am: 7e65d8dd00 am: c302876a95

am: acafcd49a8

Change-Id: Ibaad762902b51eb7fee705b2667a023cf3cea433

81adf14c15657bddc25bb2b9a17da3e0222c8a58 authored over 5 years ago

Merge "vold: use system-clang-format" am: 7e65d8dd00

am: c302876a95

Change-Id: Id9e2301657352c7d8f06bea899574f01d316a1c9

acafcd49a8ba3c79f8aa9cdd99ec28a34a4f805a authored over 5 years ago

Merge "vold: use system-clang-format"

am: 7e65d8dd00

Change-Id: Ib0e898e67aa0032d53e52676a93b56b0640e11cf

c302876a955767237ffde16ae3169f944c5c7808 authored over 5 years ago

Merge "vold: use system-clang-format"

7e65d8dd004257530d1c5c42b8dabc878c2b2155 authored over 5 years ago

vold: use system-clang-format

Link .clang-format to the standard .clang-format file (4-space-indent
version) from build/soong,...

f2201709233e29e5d943937a9593891a140dc4cd authored over 5 years ago

Merge "Add ebiggers to OWNERS" am: 88dba9a558 am: a462a57b18 am: b5b55b999a

am: c62ddd2a6f

Change-Id: I546cf00953ad1a81c8fe87298832061c0552133f

aee672914219e6827c9a8dc185b7b7a7898de3df authored over 5 years ago

Merge "Add ebiggers to OWNERS" am: 88dba9a558 am: a462a57b18

am: b5b55b999a

Change-Id: Ia8a5e7d5b1edb38a67bf3a54ca973d63203ed1ee

c62ddd2a6f0a953441dd830fe09eff4a8eb0734c authored over 5 years ago

Merge "Add ebiggers to OWNERS" am: 88dba9a558

am: a462a57b18

Change-Id: Ibb0b2be5469661a8eb7a8c08e317a3f6094564cb

b5b55b999ab7cfc3095f938e7e7207c1f4f9d6a3 authored over 5 years ago

Merge "Add ebiggers to OWNERS"

am: 88dba9a558

Change-Id: I70868eab667ea5566164ec4d8a5d19e230a89736

a462a57b182c221f194da769c556008bfc98cbf8 authored over 5 years ago

Merge "Add ebiggers to OWNERS"

88dba9a558d68b7735d924bcf487bde8ef323a16 authored over 5 years ago

Create a per-boot key on each boot

Bug: 140882488
Test: Booted twice, checked logs to ensure encryption
is different each time,...

c8a3ef3f3c501c7bc14a2078dde513765cdb56d7 authored over 5 years ago

Add ebiggers to OWNERS

Test: n/a
Change-Id: I08ece80400dae0c0d25c2fcef7168bbed9034745

a13d33af46a8adbe03de4265a64265b26cefc932 authored over 5 years ago

Merge "Request rollback resistance for FBE keys." am: aae52f4816 am: 0b895c13bc am: a15dbc415d

am: d63541df6a

Change-Id: I5905db9549ecb491f2e068b5514a53c77470c560

1ea4aadd58c5d1e1fc28bffc6bd5331298821a69 authored over 5 years ago

Merge "Request rollback resistance for FBE keys." am: aae52f4816 am: 0b895c13bc

am: a15dbc415d

Change-Id: I67443abaf053401704482066df945b64f9ad325c

d63541df6a53b7196696e15bd301c2bfb1cd80f0 authored over 5 years ago

Merge "Request rollback resistance for FBE keys." am: aae52f4816

am: 0b895c13bc

Change-Id: Ic3ad961ae342d65dd86bc7fd6a06201d55101eba

a15dbc415dcb1906db075d9af873fd0be8407c40 authored over 5 years ago

Merge "Request rollback resistance for FBE keys."

am: aae52f4816

Change-Id: Ie2143da9b9b1d2e76faa958d1a04d2be6b0045e7

0b895c13bcf5839f3c001e19cc976038df536978 authored over 5 years ago

Merge "Request rollback resistance for FBE keys."

aae52f4816097b23f1ab0455bc598e246dde460f authored over 5 years ago

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 69a1fd86d3 -s ours am: 5ccd3e3c39 -s ours

am: 203ab466d7 -s ours
am skip reason: change_id I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e with S...

f61163d1a264b4b649cc7b648daafdf32e11be99 authored over 5 years ago

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 69a1fd86d3 -s ours

am: 5ccd3e3c39 -s ours
am skip reason: change_id I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e with S...

203ab466d7471eafe81492ddb541ee9a131771ef authored over 5 years ago

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

am: 69a1fd86d3 -s ours
am skip reason: change_id I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e with S...

5ccd3e3c3961f3b9ccdb481591c37a2ee3818ba0 authored over 5 years ago

Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Bug: 135460123
Change-Id: I1605f33ede34c8289a6eede94b62c8695df81b63
Merged-In: I24f07ba89ba6e6da...

69a1fd86d359fa14d4add9aff910663030685ca6 authored over 5 years ago

Merge "Remove libhwbinder/libhidltransport deps" am: 88a19b6fe1 am: e3b772e0f7 am: 149f8d0754

am: caeeec6490

Change-Id: Iad05e6116469acd0a2e019c577e5ab05ef6c99bd

cbf87ff82c3a057f9f426ab5a11fe0c83d6bad50 authored over 5 years ago

Merge "Remove libhwbinder/libhidltransport deps" am: 88a19b6fe1 am: e3b772e0f7

am: 149f8d0754

Change-Id: I5748a2bf1d10a872d45d4e4906434f8243fb54c6

caeeec6490519a1530bc9d673b036b56f8bd9352 authored over 5 years ago

Merge "Remove libhwbinder/libhidltransport deps" am: 88a19b6fe1

am: e3b772e0f7

Change-Id: I85611b0fb0615505d06f447e46083ed2f214e8e4

149f8d07547a9f0df26b3797948c032d4c333134 authored over 5 years ago

Merge "Remove libhwbinder/libhidltransport deps"

am: 88a19b6fe1

Change-Id: I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e

e3b772e0f7653a045bd29197c8b8f3b5bf2111c4 authored over 5 years ago

Merge "Remove libhwbinder/libhidltransport deps"

88a19b6fe18c45bb7d087ad3a897fd4665e9e627 authored over 5 years ago

[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d3ceab2566 -s ours am: 9938a041f4 am: 33658d3c27

am: ae4ee5e447 -s ours
am skip reason: subject contains skip directive

Change-Id: I3c6f32d9d8e41...

2bbf876f3e0d7d3ced898819f939417b32c71a7b authored over 5 years ago

[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d3ceab2566 -s ours am: 9938a041f4

am: 33658d3c27

Change-Id: If628c65b83bedcf79aa654a257db39886af2f5f1

ae4ee5e447d5994a9e938cffbefd11c14961ed75 authored over 5 years ago

Remove libhwbinder/libhidltransport deps

Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhid...

4496ef9d342628bc67431e9e1654df9b0162bf67 authored over 5 years ago

[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d3ceab2566 -s ours

am: 9938a041f4

Change-Id: If7462b1223a40a9ac8f886e116e6674f9f96e8e3

33658d3c27834c05c381fce55e30acea73b9c81b authored over 5 years ago

[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"

am: d3ceab2566 -s ours
am skip reason: subject contains skip directive

Change-Id: Icfb843d38c7e0...

9938a041f401e85f50f75d695393f6f052e26b5c authored over 5 years ago

Merge "DO NOT MERGE - Merge Android 10 into master"

d3ceab2566182307647eeab960f4e0f044630f56 authored over 5 years ago

Merge "Fix fdsan check"

d7cffba6f4ce7b735f88e9b16e728dd3ccbb94a0 authored over 5 years ago

DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9dc8417f0d87c87eac13437834e69a52c1887258

85a94961df1b3520293d05be5b5aeab6caeae354 authored over 5 years ago

Fix fdsan check

BUG: 140376618
Test: Downloaded a picture on Chrome (this would crash previously)
Change-Id: I7a...

23edfac445f17daac50f5206e626164c6e073753 authored over 5 years ago

Avoid touching FUSE mounts on vold binder threads

On user unlock when persist.sys.fuse property is set,
StorageManagerService calls into vold to l...

1711236e02b8083f7c123a532a028e2a849364d2 authored over 5 years ago

Use unique_fd

Also allow the state just before doMount() as a valid state for setting
fuse fd.
Test: manual
BU...

a914cc764e255b639f2463976c98e92316ee27ea authored over 5 years ago

Merge "Mount /dev/fuse on /mnt/user/<userid>/<volumeid>"

336368067860005cf0d508a7e22ae6293ca0e95b authored over 5 years ago

Mount /dev/fuse on /mnt/user/<userid>/<volumeid>

Since system_server cannot mount devices by itself,
add a binder interface to vold that system_s...

3623a212e305f022a2fe279a4c13ec2a6513d6e7 authored over 5 years ago

Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be am: 4b1dad6065 am: d0282ac35d

am: 68094b8d13

Change-Id: If612ac21b99f16c1bc64fadb3c9e6e0336c6e536

bb01c051151a01d6cb4f819a3ced1c029dc3be07 authored over 5 years ago

Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be am: 4b1dad6065

am: d0282ac35d

Change-Id: I4d52cc2fe823ba8f18ff6f349259d77ab131bf1f

68094b8d1364eadf9244ae2eda18e6379399d632 authored over 5 years ago

Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be

am: 4b1dad6065

Change-Id: I667b5dca43a554a7f9445e18f0d536e3c7582df4

d0282ac35d8b6fa03cb7c2450d4fbf065b2e64b8 authored over 5 years ago

Merge "Fix ext4/metadata/udc issue" am: ee867be1f1

am: 3096e373be

Change-Id: I99ba00610a8f48f58bc8f51952bad49c6dc73fb1

4b1dad606505102d7c2f24a847d73b6de24a4eb0 authored over 5 years ago

Merge "Fix ext4/metadata/udc issue"

am: ee867be1f1

Change-Id: I69b89b464a4d04b27e1da7d3990dcbec9525afe4

3096e373beb74e64169465cd0422d18bb9c74730 authored over 5 years ago

Merge "Fix ext4/metadata/udc issue"

ee867be1f1bc6628cea3dcabb84a55a4ad7d459d authored over 5 years ago

Merge "Fix crash in mainline" am: 3a0d51f6b7 am: 6c5944f899 am: 9cd7fdc882 am: 06bd0c427f

am: 0f3c17b50f

Change-Id: I5425ca6ef3f65fbbec7b6d105054d9abf9d39c09

5807c327255d354696ba9ce5e39fa253e693548c authored over 5 years ago

Merge "Fix crash in mainline" am: 3a0d51f6b7 am: 6c5944f899 am: 9cd7fdc882

am: 06bd0c427f

Change-Id: I689671afb25643d2e36e65e13374dd69051341b2

0f3c17b50ff5d5005bf488f9029c5a761285101f authored over 5 years ago

Merge "Fix crash in mainline" am: 3a0d51f6b7 am: 6c5944f899

am: 9cd7fdc882

Change-Id: I13d6316005c1df1482f8426a25d672519873b4d1

06bd0c427f3bf0a0589341f419dab946b6a38752 authored over 5 years ago

Merge "Fix crash in mainline" am: 3a0d51f6b7

am: 6c5944f899

Change-Id: I2d40676c59d364c02154bced41e6ce818b5d4886

9cd7fdc8829ded0eb45e5f35d01eebaf7c700b59 authored over 5 years ago

Merge "Fix crash in mainline"

am: 3a0d51f6b7

Change-Id: I63925fd090707f56076a59349c237a83f4ec8234

6c5944f899cfaa6c439637e0d456c9acd07c7485 authored over 5 years ago

Merge "Fix crash in mainline"

3a0d51f6b77df6477fc66601ad33083d27ccbd76 authored over 5 years ago

Fix crash in mainline

Current behavior:

Assume not checkpointing
cp_startCheckpoint creates the file in metadata
cp_n...

9a6d1f73e5db980b29f8b90940669f6a1ba8a352 authored over 5 years ago

Merge "Fix race condition is commitCheckpoint" am: 1059810759 am: 556bd755e6 am: 86bc2a32d8 am: 466c1c07dd

am: 18aca481ff

Change-Id: I49d52fc1209a0c59d24ca35a81fff4fdfb8ed107

fc345f1c6434c9150e693a8973992200c826c8d4 authored over 5 years ago

Merge "Fix race condition is commitCheckpoint" am: 1059810759 am: 556bd755e6 am: 86bc2a32d8

am: 466c1c07dd

Change-Id: Iedcdde19dc54a2a9ee5a1b104f1bcc9c46ca8af7

18aca481ff0a076b28bc9cbc1196cad8fd039218 authored over 5 years ago

Merge "Fix race condition is commitCheckpoint" am: 1059810759 am: 556bd755e6

am: 86bc2a32d8

Change-Id: Ie255d33f5f6efd049c0a3e8a619c1333069c0e8c

466c1c07ddb04e267d11fdad83e09830b1844e7a authored over 5 years ago

Merge "Fix race condition is commitCheckpoint" am: 1059810759

am: 556bd755e6

Change-Id: Ie80a3c123a5d30915cade7ddc1aad2d790476448

86bc2a32d83db2edfa2ce050b6593f0bb2c00d10 authored over 5 years ago

Merge "Fix race condition is commitCheckpoint"

am: 1059810759

Change-Id: I3cb7931ee01d208cb6f5f435aa5fc40cacd78b65

556bd755e6a6831b68f0cafc886437c383facb6c authored over 5 years ago

Merge "Fix race condition is commitCheckpoint"

10598107597c619f7bc06bf1f79dea541fce341b authored over 5 years ago

Fix race condition is commitCheckpoint

If cp_commitCheckpoint is called twice at the same time, the second call
to setBowState will fai...

1d57f686a359d9a334ad856512049e55728ec57c authored over 5 years ago

Fix ext4/metadata/udc issue

Test: Cannot test since no device supports this combo
Bug: 137924328
Change-Id: I451c90e0826ede7...

4b140d397f8283021f9be96cf07691179c4128e6 authored over 5 years ago

Snap for 5797917 from 6c5e453f9ee8363e970c7b5e2be503879089c3c3 to qt-c2f2-release

Change-Id: I92e29452f176731c03fc482e5394cc5fad17c9c9

c4fd7be670c9ed64e699b2f575ce9fbfc7623267 authored over 5 years ago

secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e am: 2af145ef20

am: 7ebe1a4bd8

Change-Id: I7475f738e3d46bb1cb24a75995dbc0e25231356b

679b05855af4a840dd47cf4c4b569e2d00d60536 authored over 5 years ago

secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e am: 732faaeb94

am: ceac8b8587

Change-Id: I0681b3aba14a0723f904c5e9246811e035949130

6a1fc39c5a650e7cb87fc604428f21b0f8342204 authored over 5 years ago

secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e

am: 2af145ef20

Change-Id: I6580f3e7b2adbb910295657e3c6ae67b8893da2a

7ebe1a4bd82e7918451c6edf66fb3a71b1ac2fc6 authored over 5 years ago

secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e

am: 732faaeb94

Change-Id: I8ae6f3b8e7950a9978741879d3b4ac344af61a60

ceac8b8587d09851ad27322b5a8a2a59acbd3fa2 authored over 5 years ago

secdiscard: should call fsync to avoid reordering IOs

am: 6c5e453f9e

Change-Id: I5710fcce302d040a29ff798df85bf71ef6e3fbb5

732faaeb9405627b8777627f473fe04950f5fec6 authored over 5 years ago

secdiscard: should call fsync to avoid reordering IOs

am: 6c5e453f9e

Change-Id: I90de814c136171d4ff2ce913b801171e7f27c70e

2af145ef20f9047fb9abbe7d40046ab9ab1f3249 authored over 5 years ago

secdiscard: should call fsync to avoid reordering IOs

Don't make stale zero'ing IO in block device after unlink, since filesystem
can reuse the block ...

6c5e453f9ee8363e970c7b5e2be503879089c3c3 authored over 5 years ago

Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe am: e91c2686e9 am: d26cb98c4d

am: 0be952d362

Change-Id: Icaa2f68ea5857df5dda76ebeb0ade0bbc9d26ccc

7cd6ceb835d1116d97e01fe4757cfbe8531970d5 authored over 5 years ago

Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe am: e91c2686e9

am: d26cb98c4d

Change-Id: Ie6988c9cdf17a1f36a4f9aa59544ba5f461d825b

0be952d36299537ee0a1f6db5c7bdef708ded811 authored over 5 years ago

Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe

am: e91c2686e9

Change-Id: I585749bae8d30931a164b5f2a7900fea2fe1aa29

d26cb98c4d4c8b34598c8697cdb50765951165f7 authored over 5 years ago

Merge "libdm now requires linking to libext2_uuid."

am: 9e821da9fe

Change-Id: Id33c9fc83352535cb45f27e70dec6000c73b07a5

e91c2686e92ae61db6bc15f1945327f819edc4d9 authored over 5 years ago

Merge "libdm now requires linking to libext2_uuid."

9e821da9fea9c24b837c1b22c348c93ad804b5fd authored over 5 years ago

[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 711f4faac3 -s ours am: e7487087d0 -s ours am: 49304ac627

am: ccf6d331b8 -s ours
am skip reason: subject contains skip directive

Change-Id: I0ee8d1638313e...

33a52284b88349e83456380b62c24d2cf7c7d44e authored over 5 years ago

[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 711f4faac3 -s ours am: e7487087d0 -s ours

am: 49304ac627

Change-Id: I0ef4e364f9afe14cec3a1c9a6d389709bf2e59ce

ccf6d331b8dc696482ad25e15823ddc039f2e4cf authored over 5 years ago

[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 33080d8b49 -s ours am: 2c1e06e589 -s ours am: 4c373e4563

am: 1c4860773a -s ours
am skip reason: subject contains skip directive

Change-Id: Ib80d9941780b9...

70adcce6ac7348206dc0c6085d9d3700973c0f47 authored over 5 years ago

[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 33080d8b49 -s ours am: 2c1e06e589 -s ours

am: 4c373e4563

Change-Id: If915398214afac55d629175c502dbaaa1a875f3c

1c4860773a8197bdb4575b0cd2f7605ba5576456 authored over 5 years ago

[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 711f4faac3 -s ours

am: e7487087d0 -s ours
am skip reason: subject contains skip directive

Change-Id: I94ad8ca99f9a6...

49304ac627831364153a897d3eeb6398575ad2fd authored over 5 years ago

[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"

am: 711f4faac3 -s ours
am skip reason: subject contains skip directive

Change-Id: I334dfe94d7070...

e7487087d08d6271e31c6554ed1b8ea06b605699 authored over 5 years ago

[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 33080d8b49 -s ours

am: 2c1e06e589 -s ours
am skip reason: subject contains skip directive

Change-Id: If8cd430d5b10f...

4c373e4563f2fb1f45b0bc61a46343c10979cfe3 authored over 5 years ago

[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master

am: 33080d8b49 -s ours
am skip reason: subject contains skip directive

Change-Id: Id76bbc6615fa3...

2c1e06e589f9fa27343f69e2bfa532dd34663fca authored over 5 years ago

Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"

711f4faac3dd797b92fe65ff3b381dad3c71c3b8 authored over 5 years ago

DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master

Bug: 136196576
Change-Id: I2fc2c9bb2631e627ebe74b6f081819c1eb0f3fcd

33080d8b4938d06bb6d017804016b2bda34488f0 authored over 5 years ago

Snap for 5622519 from 59295fbb94e3a75c3341419aadbc66c560296179 to pi-platform-release

Change-Id: I402d144258df8eefe4c87766616ba32221bfbb67

ec0cb71ca1f4f4958240d87e9f3e1347f65484f6 authored over 5 years ago

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: aaea4b51ed

am: e39e69254e -s ours
am skip reason: subject contains skip directive

Change-Id: I70cd10460af03...

6660781ddb194efb19089ed10d412c1be7bd856e authored over 5 years ago

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master

am: aaea4b51ed

Change-Id: Id23cf76973224c771883eb1abb38191fc52d679b

e39e69254e1ee052fcc8e78865f08cd98900f434 authored over 5 years ago

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master

Bug: 134405016
Change-Id: I19ac2279aa2cb1c5ad444d25484aa1ec0d7efac6

aaea4b51ed7436992b572b9a53bf0cd14b24c87c authored over 5 years ago

[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am: dde9704664 am: 7d43cb0ae9 -s ours

am: 39a0ecec18 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with S...

ca2f3aa268617a57cb8d9febd7aafdac035941d3 authored over 5 years ago

[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am: dde9704664

am: 7d43cb0ae9 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with S...

39a0ecec18da672f092b7de390e57a93a82ba6df authored over 5 years ago

Ecosyste.ms: OpenCollective

github.com/PitchBlackRecoveryProject/android_system_vold