Commit graph

3226 commits

Author SHA1 Message Date
Paul Crowley
a1c405a8f2 Merge "Create a per-boot key on each boot" am: dab5ddf663 am: 6db7fa72a5 am: 03336816a7
am: d678142ac6

Change-Id: I7ab21b901ac8fd8a746f7190a340c518e099a48a
2019-09-16 23:20:15 -07:00
Paul Crowley
d678142ac6 Merge "Create a per-boot key on each boot" am: dab5ddf663 am: 6db7fa72a5
am: 03336816a7

Change-Id: I79b13f2fa4c002d5242a5d498ec5db385b7199bd
2019-09-16 23:14:14 -07:00
Paul Crowley
03336816a7 Merge "Create a per-boot key on each boot" am: dab5ddf663
am: 6db7fa72a5

Change-Id: I2543c7cd24fcdbd13b08e9afc4d1e0a448dc3373
2019-09-16 23:07:10 -07:00
Paul Crowley
6db7fa72a5 Merge "Create a per-boot key on each boot"
am: dab5ddf663

Change-Id: Iee4dabdcccedcbf652ae23edb4d20404947a765c
2019-09-16 23:01:13 -07:00
Paul Crowley
dab5ddf663 Merge "Create a per-boot key on each boot" 2019-09-17 05:40:05 +00:00
Eric Biggers
31858e2e72 Merge "vold: use system-clang-format" am: 7e65d8dd00 am: c302876a95 am: acafcd49a8
am: 81adf14c15

Change-Id: Ic9f18b013f5bd332c9b1061450b1b3932ff229c4
2019-09-16 14:47:32 -07:00
Eric Biggers
81adf14c15 Merge "vold: use system-clang-format" am: 7e65d8dd00 am: c302876a95
am: acafcd49a8

Change-Id: Ibaad762902b51eb7fee705b2667a023cf3cea433
2019-09-16 14:43:31 -07:00
Eric Biggers
acafcd49a8 Merge "vold: use system-clang-format" am: 7e65d8dd00
am: c302876a95

Change-Id: Id9e2301657352c7d8f06bea899574f01d316a1c9
2019-09-16 14:31:42 -07:00
Eric Biggers
c302876a95 Merge "vold: use system-clang-format"
am: 7e65d8dd00

Change-Id: Ib0e898e67aa0032d53e52676a93b56b0640e11cf
2019-09-16 14:20:47 -07:00
Eric Biggers
7e65d8dd00 Merge "vold: use system-clang-format" 2019-09-16 21:03:26 +00:00
Eric Biggers
f220170923 vold: use system-clang-format
Link .clang-format to the standard .clang-format file (4-space-indent
version) from build/soong, rather than use a custom file.

Among other changes, the standard file has the "IncludeBlocks: Preserve"
setting, so include blocks stay in order.

Don't actually reformat all the code yet.

Test: Tried 'clang-format -i $(find . -name \*.cpp -o -name \*.h)'
      and checked that the changes look sane.
Change-Id: I11ecbd03b31e44ba7b3e01175a6fc317f8173ab0
2019-09-16 12:00:40 -07:00
Paul Crowley
aee6729142 Merge "Add ebiggers to OWNERS" am: 88dba9a558 am: a462a57b18 am: b5b55b999a
am: c62ddd2a6f

Change-Id: I546cf00953ad1a81c8fe87298832061c0552133f
2019-09-16 11:03:08 -07:00
Paul Crowley
c62ddd2a6f Merge "Add ebiggers to OWNERS" am: 88dba9a558 am: a462a57b18
am: b5b55b999a

Change-Id: Ia8a5e7d5b1edb38a67bf3a54ca973d63203ed1ee
2019-09-16 10:56:18 -07:00
Paul Crowley
b5b55b999a Merge "Add ebiggers to OWNERS" am: 88dba9a558
am: a462a57b18

Change-Id: Ibb0b2be5469661a8eb7a8c08e317a3f6094564cb
2019-09-16 10:48:06 -07:00
Paul Crowley
a462a57b18 Merge "Add ebiggers to OWNERS"
am: 88dba9a558

Change-Id: I70868eab667ea5566164ec4d8a5d19e230a89736
2019-09-16 10:42:06 -07:00
Paul Crowley
88dba9a558 Merge "Add ebiggers to OWNERS" 2019-09-16 17:23:02 +00:00
Paul Crowley
c8a3ef3f3c Create a per-boot key on each boot
Bug: 140882488
Test: Booted twice, checked logs to ensure encryption
    is different each time, adb created files in directory.
Change-Id: I74077bf8f727dab726c25f512ed7406a74cbe0bf
2019-09-13 15:46:48 -07:00
Paul Crowley
a13d33af46 Add ebiggers to OWNERS
Test: n/a
Change-Id: I08ece80400dae0c0d25c2fcef7168bbed9034745
2019-09-13 15:06:45 -07:00
Shawn Willden
1ea4aadd58 Merge "Request rollback resistance for FBE keys." am: aae52f4816 am: 0b895c13bc am: a15dbc415d
am: d63541df6a

Change-Id: I5905db9549ecb491f2e068b5514a53c77470c560
2019-09-12 09:50:00 -07:00
Shawn Willden
d63541df6a Merge "Request rollback resistance for FBE keys." am: aae52f4816 am: 0b895c13bc
am: a15dbc415d

Change-Id: I67443abaf053401704482066df945b64f9ad325c
2019-09-12 09:43:02 -07:00
Shawn Willden
a15dbc415d Merge "Request rollback resistance for FBE keys." am: aae52f4816
am: 0b895c13bc

Change-Id: Ic3ad961ae342d65dd86bc7fd6a06201d55101eba
2019-09-12 09:36:44 -07:00
Shawn Willden
0b895c13bc Merge "Request rollback resistance for FBE keys."
am: aae52f4816

Change-Id: Ie2143da9b9b1d2e76faa958d1a04d2be6b0045e7
2019-09-12 09:29:15 -07:00
Treehugger Robot
aae52f4816 Merge "Request rollback resistance for FBE keys." 2019-09-12 15:20:45 +00:00
Xin Li
f61163d1a2 [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 SHA1 e3b772e0f7 is in history

Change-Id: I1294a1c17d2e17fd1e03690bedd5d671b6601959
2019-09-11 15:54:02 -07:00
Xin Li
203ab466d7 [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 SHA1 e3b772e0f7 is in history

Change-Id: I5113813143261cd2779447fe8f30c8c30d0167a3
2019-09-11 15:02:35 -07:00
Xin Li
5ccd3e3c39 [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 SHA1 e3b772e0f7 is in history

Change-Id: If121600192dd236e9b868d579459c566eaddbd69
2019-09-11 14:15:18 -07:00
Xin Li
69a1fd86d3 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I1605f33ede34c8289a6eede94b62c8695df81b63
Merged-In: I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e
2019-09-08 13:07:03 -07:00
Steven Moreland
cbf87ff82c Merge "Remove libhwbinder/libhidltransport deps" am: 88a19b6fe1 am: e3b772e0f7 am: 149f8d0754
am: caeeec6490

Change-Id: Iad05e6116469acd0a2e019c577e5ab05ef6c99bd
2019-09-06 16:28:35 -07:00
Steven Moreland
caeeec6490 Merge "Remove libhwbinder/libhidltransport deps" am: 88a19b6fe1 am: e3b772e0f7
am: 149f8d0754

Change-Id: I5748a2bf1d10a872d45d4e4906434f8243fb54c6
2019-09-06 16:07:06 -07:00
Steven Moreland
149f8d0754 Merge "Remove libhwbinder/libhidltransport deps" am: 88a19b6fe1
am: e3b772e0f7

Change-Id: I85611b0fb0615505d06f447e46083ed2f214e8e4
2019-09-06 14:55:27 -07:00
Steven Moreland
e3b772e0f7 Merge "Remove libhwbinder/libhidltransport deps"
am: 88a19b6fe1

Change-Id: I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e
2019-09-06 14:32:26 -07:00
Treehugger Robot
88a19b6fe1 Merge "Remove libhwbinder/libhidltransport deps" 2019-09-06 20:12:41 +00:00
Xin Li
2bbf876f3e [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: I3c6f32d9d8e41cb8d1ae99d5e0c9ada0446a811f
2019-09-05 15:19:11 -07:00
Xin Li
ae4ee5e447 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d3ceab2566 -s ours am: 9938a041f4
am: 33658d3c27

Change-Id: If628c65b83bedcf79aa654a257db39886af2f5f1
2019-09-05 14:56:46 -07:00
Steven Moreland
4496ef9d34 Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I890b572d537d66ecb49effd8efc782279c52956e
2019-09-05 14:18:22 -07:00
Xin Li
33658d3c27 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d3ceab2566 -s ours
am: 9938a041f4

Change-Id: If7462b1223a40a9ac8f886e116e6674f9f96e8e3
2019-09-05 14:18:12 -07:00
Xin Li
9938a041f4 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: d3ceab2566 -s ours
am skip reason: subject contains skip directive

Change-Id: Icfb843d38c7e0ed07d1f09982bffdbfaa290d1f6
2019-09-05 13:47:41 -07:00
Xin Li
d3ceab2566 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:32 +00:00
Zimuzo Ezeozue
d7cffba6f4 Merge "Fix fdsan check" 2019-09-04 21:15:46 +00:00
Xin Li
85a94961df DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I9dc8417f0d87c87eac13437834e69a52c1887258
2019-09-04 13:35:31 -07:00
Nandana Dutt
23edfac445 Fix fdsan check
BUG: 140376618
Test: Downloaded a picture on Chrome (this would crash previously)
Change-Id: I7a750cde1131d19d140140dfaa0bd09131974fc0
2019-09-04 09:23:01 +01:00
Zim
1711236e02 Avoid touching FUSE mounts on vold binder threads
On user unlock when persist.sys.fuse property is set,
StorageManagerService calls into vold to link the primary
volumes. Because this involves accessing a FUSE path that
has not been initialized, vold should offload this work
from the binder thread, otherwise it would wedge and the
system server would wedge causing a Watchdog trigger.

This fixes a bug where we 'link primary' twice and vold
gets wedged on system server restarts.

Bug: 140064376
Test: with the FUSE property set:
adb shell stop && adb shell start && adb shell ls /sdcard

Change-Id: I0eb86f8ba256c385c916e2a0389a4f7482fc3775
2019-09-03 23:12:12 +01:00
Nandana Dutt
a914cc764e Use unique_fd
Also allow the state just before doMount() as a valid state for setting
fuse fd.
Test: manual
BUG:140173712

Change-Id: I012f8a83fef00e68f33010954fbc2ebc53cf8f1d
2019-08-29 15:25:13 +01:00
Zimuzo Ezeozue
3363680678 Merge "Mount /dev/fuse on /mnt/user/<userid>/<volumeid>" 2019-08-28 16:27:02 +00:00
Zim
3623a212e3 Mount /dev/fuse on /mnt/user/<userid>/<volumeid>
Since system_server cannot mount devices by itself,
add a binder interface to vold that system_server
can call to initiate this mount when required.

BUG: 135341433
Test: manual
Test: atest --test-mapping packages/providers/MediaProvider
Test: ExternalStorageHostTest DownloadProviderTests

Change-Id: If4fd02a1f1a8d921a3f96783d8c73e085c5b7ca1
2019-08-28 10:49:27 +01:00
Paul Lawrence
bb01c05115 Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be am: 4b1dad6065 am: d0282ac35d
am: 68094b8d13

Change-Id: If612ac21b99f16c1bc64fadb3c9e6e0336c6e536
2019-08-27 09:29:36 -07:00
Paul Lawrence
68094b8d13 Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be am: 4b1dad6065
am: d0282ac35d

Change-Id: I4d52cc2fe823ba8f18ff6f349259d77ab131bf1f
2019-08-27 09:19:35 -07:00
Paul Lawrence
d0282ac35d Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be
am: 4b1dad6065

Change-Id: I667b5dca43a554a7f9445e18f0d536e3c7582df4
2019-08-27 09:10:04 -07:00
Paul Lawrence
4b1dad6065 Merge "Fix ext4/metadata/udc issue" am: ee867be1f1
am: 3096e373be

Change-Id: I99ba00610a8f48f58bc8f51952bad49c6dc73fb1
2019-08-27 08:51:50 -07:00
Paul Lawrence
3096e373be Merge "Fix ext4/metadata/udc issue"
am: ee867be1f1

Change-Id: I69b89b464a4d04b27e1da7d3990dcbec9525afe4
2019-08-27 08:45:00 -07:00