Commit graph

2083 commits

Author SHA1 Message Date
Paul Crowley
f8231e061b Remove CheckBattery altogether am: a04014bf26
am: de90f76fe2  -s ours

Change-Id: I78e6567442b490d6e0df1f2df70afd8c04883d40
2017-10-03 23:29:16 +00:00
Treehugger Robot
2890b8d215 Merge "Remove CheckBattery altogether" 2017-10-03 23:19:02 +00:00
Paul Crowley
de90f76fe2 Remove CheckBattery altogether
am: a04014bf26

Change-Id: I7aefe1d6f4815a7f02671869fe940a3cdd13cd70
2017-10-03 22:08:31 +00:00
Paul Crowley
5385417922 Remove CheckBattery altogether
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
2017-10-03 11:53:36 -07:00
Paul Crowley
a04014bf26 Remove CheckBattery altogether
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
2017-10-03 10:45:23 -07:00
Paul Crowley
1b992e4f26 Remove CheckBattery altogether
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
2017-10-02 16:20:49 -07:00
Yifan Hong
c8e7d35237 Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e am: 2313818c46 am: a6f34f6e78
am: da59b50f70

Change-Id: I7efb2dd4ff1bfbc0e9ec16fcb29e4b2e50e9e163
2017-09-28 18:34:53 +00:00
Yifan Hong
da59b50f70 Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e am: 2313818c46
am: a6f34f6e78

Change-Id: I824e6e9285013895bc989e2667e297e130b6e1af
2017-09-28 18:32:23 +00:00
Yifan Hong
a6f34f6e78 Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e
am: 2313818c46

Change-Id: I1faae4261398a107aee274a7b6a4b05766786257
2017-09-28 18:30:01 +00:00
Yifan Hong
2313818c46 Merge "vold: remove unnecessary dependency on libbatteryservice."
am: 7b0ac6d37e

Change-Id: I772e82a8ae54477014076be34b7dab5cb968fba7
2017-09-28 18:21:49 +00:00
Treehugger Robot
7b0ac6d37e Merge "vold: remove unnecessary dependency on libbatteryservice." 2017-09-28 18:14:42 +00:00
Yifan Hong
57838d665f vold: remove unnecessary dependency on libbatteryservice.
Battery check could be replaced by hwbinder calls into
android.hardware.health@2.0 instead, but because
of b/16868177, this is actually not needed.

Bug: 62229583
Test: pass
Change-Id: Ieb03e6ee2f648d9c1d85dbbdc10626726f5fe39b
2017-09-27 18:49:18 -07:00
Paul Crowley
3c3e360546 Revert "Revert "Be more aggressive about obtaining vold service.""
This reverts commit 5687066dcc.

Reason for revert: ag/2966951 fixes the underlying problem.

Bug: 66739076
Bug: 65737446
Test: reboot-cycle.sh doesn't show a problem.
Change-Id: If4b9c5cc39e9e905d2b1e78f091609be641fc22a
2017-09-27 11:20:01 -07:00
Paul Crowley
3188805e35 Read the configuration before starting the native service.
Bug: 66739076
Bug: 65737446
Test: reboot-cycle.sh doesn't show a problem.
Change-Id: Ia0699cca7e07475d4df266b482a3b2c96519ed3b
2017-09-27 10:56:54 -07:00
TreeHugger Robot
12274eea5c Merge "Refactor of use of fstab in advance of fix." 2017-09-26 23:19:17 +00:00
Paul Crowley
e2ee152e46 Refactor of use of fstab in advance of fix.
Test: Ensure device still boots.
Bug: 65737446
Change-Id: Ie466db9f5d8c77656cc525c0d49fe6a3cce154f1
2017-09-26 14:21:10 -07:00
TreeHugger Robot
6329c1b7a7 Merge "Revert "Be more aggressive about obtaining vold service."" 2017-09-26 01:08:42 +00:00
Jeff Sharkey
5687066dcc Revert "Be more aggressive about obtaining vold service."
This reverts commit 4a53a9edb3.

Change-Id: Ie4058488226bf53b78063dd3feb011dbd0167d1e
2017-09-25 23:21:24 +00:00
Rom Lemarchand
77823360b4 Revert "Revert "Add support for gid derivation on private volumes""
am: 958c216d87

Change-Id: Ic75b411b3aec784cdc19db3e5bedda7cd21a5306
2017-09-22 23:20:29 +00:00
Rom Lemarchand
958c216d87 Revert "Revert "Add support for gid derivation on private volumes""
This reverts commit a3a60b372e.

Reason for revert: All kernel prebuilts merged

(cherry picked from commit 75ae529bf8)

Bug: 65600849
Bug: 65573871
Test: m
Change-Id: I75b0cb1d82213b875cbef8d39f4f1a8fb34b9795
2017-09-22 14:30:56 -07:00
Richard Uhler
0a34be8472 Merge "Revert "Add support for gid derivation on private volumes"" am: 9588da7095 am: 6b264e4a4c am: 3ed63e8d21
am: 4a921633fa

Change-Id: I0363e160698cb31e19fab984d5b40561fe480889
2017-09-22 17:34:57 +00:00
Richard Uhler
4a921633fa Merge "Revert "Add support for gid derivation on private volumes"" am: 9588da7095 am: 6b264e4a4c
am: 3ed63e8d21

Change-Id: Ie3abbe2dee226330576e42b44910652ff272eb74
2017-09-22 17:32:02 +00:00
Richard Uhler
3ed63e8d21 Merge "Revert "Add support for gid derivation on private volumes"" am: 9588da7095
am: 6b264e4a4c

Change-Id: Ic617080e8f98079bd3075621dc85f5dfa00ff5ba
2017-09-22 17:30:00 +00:00
Richard Uhler
6b264e4a4c Merge "Revert "Add support for gid derivation on private volumes""
am: 9588da7095

Change-Id: Ie2e32cca7542cdc1aaec5e8481b6a255b3c3b298
2017-09-22 17:24:03 +00:00
Treehugger Robot
9588da7095 Merge "Revert "Add support for gid derivation on private volumes"" 2017-09-22 17:21:55 +00:00
Richard Uhler
32a7b7fe82 Revert "Add support for gid derivation on private volumes"
This reverts commit 1b38e33003.

Causes a boot loop on bullhead.

(cherry picked from commit a3a60b372e)

Bug: 63245673
Bug: 65660058
Test: m
Merged-In: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
Change-Id: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
2017-09-22 09:04:05 -07:00
Jeff Sharkey
8cb56e249a Merge "Be more aggressive about obtaining vold service." 2017-09-22 03:10:27 +00:00
Jeff Sharkey
b21add1d79 Merge "Make Loop::destroyAll() smarter." 2017-09-22 01:10:49 +00:00
Jeff Sharkey
4a53a9edb3 Be more aggressive about obtaining vold service.
vdc is typically invoked very early during boot, where it races with
vold starting up.  The default getService() implementation waits a
whole second between retrying, so write a local getServiceAggressive()
that only waits 10ms between attempts.

Test: builds, boots
Bug: 65737446
Change-Id: I581db3afcf7f81dd7cd9cc84dc03194759861669
2017-09-21 18:20:59 -06:00
Jeff Sharkey
67b8c49530 Make Loop::destroyAll() smarter.
Instead of blindly looping across 4096 possible devices, use
readdir() to only look at valid devices.  This speeds up destroyAll()
from 40ms to 0.7ms.

Add tracing information in several places.

Test: external/chromium-trace/systrace.py -b 128768 sched freq am pm ss core_services binder_driver -a system_server,installd,vold
Bug: 65634729, 65737446
Change-Id: If581de47fb55850c0fcd6e25bf33ed246e1b079d
2017-09-21 17:11:07 -06:00
Jeff Sharkey
5b644aae30 Merge "Enable "cert-err34-c" tidy checks." 2017-09-21 15:40:02 +00:00
Daniel Rosenberg
6ef76f2966 Merge "Add support for gid derivation on private volumes" am: 0b7dbf0b1c am: c2c183e02c am: 2c629a9d48
am: d9307f8df7

Change-Id: I61b929212d27ff0ce74d53d0576799b0623505d1
2017-09-21 04:14:29 +00:00
Daniel Rosenberg
d9307f8df7 Merge "Add support for gid derivation on private volumes" am: 0b7dbf0b1c am: c2c183e02c
am: 2c629a9d48

Change-Id: I3479e5656327023526ffbf8c9b973362e4df2321
2017-09-21 01:07:43 +00:00
Daniel Rosenberg
2c629a9d48 Merge "Add support for gid derivation on private volumes" am: 0b7dbf0b1c
am: c2c183e02c

Change-Id: I71b1249e1d97bda5dc177881e0d01e3374bcf0a8
2017-09-21 01:05:14 +00:00
Daniel Rosenberg
c2c183e02c Merge "Add support for gid derivation on private volumes"
am: 0b7dbf0b1c

Change-Id: I55313f24f2d932fb76d1b107c9e765b507f0403d
2017-09-21 01:03:16 +00:00
Treehugger Robot
0b7dbf0b1c Merge "Add support for gid derivation on private volumes" 2017-09-21 00:57:48 +00:00
Daniel Rosenberg
4e8cec1fce Add support for gid derivation on private volumes
This sdcardfs feature was moved under a mount option
and is only needed on private volumes

Test: Private emulated volume should attempt to mount with
      derive_gid option.
Bug: 63245673
Change-Id: I40a8b15c298c815a4643007b9eca8269379fd2ac
2017-09-20 15:57:52 -07:00
Jeff Sharkey
95440ebd97 Enable "cert-err34-c" tidy checks.
Now that we've moved to Binder, we only have a few lingering atoi()
usages that are cleaned up in this CL.

Rewrite match_multi_entry() entirely, with tests to verify both old
and new implementations.

Test: adb shell /data/nativetest/vold_tests/vold_tests
Bug: 36655947
Change-Id: Ib79dc1ddc2366db4d5b4e1a1e2ed9456a06a983e
2017-09-20 13:29:48 -06:00
Jeff Sharkey
49672b9351 Merge "Destroy vold socket interface completely." 2017-09-19 05:11:08 +00:00
TreeHugger Robot
815b42a2a5 Merge "Timeout if device isn't mounted." 2017-09-18 22:32:29 +00:00
Jeff Sharkey
cbe69fc060 Destroy vold socket interface completely.
Long live Binder.

Test: yes
Bug: 13758960
Change-Id: If6be379b5a873f1b0c66dd1522b87413ad10fc46
2017-09-18 16:00:14 -06:00
Jeff Sharkey
7bdf4d5a0f Timeout if device isn't mounted.
If the invoked FUSE binary fails to mount the requested filesystem,
the dev_t won't actually change.  To avoid getting waiting forever
and triggering the watchdog, timeout after 5 seconds.

Test: manually hang after fork and verify that we timeout
Bug: 65756209
Change-Id: I6ea5fd08ed14c72c1d7f7064bfd0d9ac81d4897b
2017-09-18 14:47:12 -06:00
Jeff Sharkey
57b1874505 Add "mountdefaultencrypted" command to vdc.
It's being used by the emulator.

Test: vdc --wait cryptfs mountdefaultencrypted
Bug: 65795120
Change-Id: I8a5d622e4fa1ef93bb8e22f2665c882b1a152b3d
2017-09-18 13:49:53 -06:00
Jeff Sharkey
5820b51c22 Merge "Move long-running calls to async with listeners." 2017-09-15 22:45:55 +00:00
Rom Lemarchand
85d5d27bcc Merge "Revert "Revert "Add support for gid derivation on private volumes""" into oc-mr1-dev am: d4af166db8
am: 29e8bb5df1

Change-Id: Ie0fef9462a10165f62c37d80326b0db63439685d
2017-09-15 22:06:02 +00:00
Rom Lemarchand
29e8bb5df1 Merge "Revert "Revert "Add support for gid derivation on private volumes""" into oc-mr1-dev
am: d4af166db8

Change-Id: Iadec8e0e5edec0a61d15d46dd85e0ec7253da62a
2017-09-15 22:02:59 +00:00
TreeHugger Robot
d4af166db8 Merge "Revert "Revert "Add support for gid derivation on private volumes""" into oc-mr1-dev 2017-09-15 21:59:32 +00:00
Rom Lemarchand
75ae529bf8 Revert "Revert "Add support for gid derivation on private volumes""
This reverts commit a3a60b372e.

Reason for revert: All kernel prebuilts merged

Bug: 65600849
Bug: 65573871
Change-Id: I75b0cb1d82213b875cbef8d39f4f1a8fb34b9795
2017-09-15 20:36:11 +00:00
Jeff Sharkey
52f7a91934 Move long-running calls to async with listeners.
Now that we're using Binder, we can have callers provide explicit
listeners for every request instead of trying to squeeze them all
into unsolicited socket events.

Move benchmarking to be async to avoid blocking other commands for
up to several minutes.  Remove post-trim benchmarking flag, since
benchmarking now requires a separate callback.  Will bring back in
a future CL.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Test: adb shell sm fstrim
Bug: 62201209, 13758960
Change-Id: I0f2ebf1ac3b4252ecd6b44303f2887adfdb58e86
2017-09-15 14:18:00 -06:00
Richard Uhler
97cb6e597c Merge "Revert "Add support for gid derivation on private volumes"" into oc-mr1-dev am: 3bfa263f53
am: fe64fee09d

Change-Id: I818351970b66d18492c3c181618069602ad3ee26
2017-09-15 10:09:05 +00:00