Commit Graph

6617 Commits

Author SHA1 Message Date
Treehugger Robot
6265eea819 Merge "Document that SystemProperties.set() can throw RuntimeException" 2019-09-20 05:53:03 +00:00
Tom Cherry
39373b2e81 Document that SystemProperties.set() can throw RuntimeException
Bug: 140148206
Test: n/a
Change-Id: I32df2ed4979edcc0d9abc46830ebd3defc431c57
2019-09-19 08:41:44 -07:00
Victor Hsieh
3c68afee05 Mirror fs-verity ownership UID to Java
This has been done in system/core, so mirroring for later use.
https://android-review.googlesource.com/c/platform/system/core/+/1115493

Test: compile
Bug: 112038744
Change-Id: I2d7f5d38caae0b6ada1f208b3d71d937d527716e
2019-09-18 14:33:54 -07:00
Yifan Hong
bc45ac13ef Merge "VintfObject: Fix getHalNamesAndVersions doc" 2019-09-16 23:58:51 +00:00
Kyeongkab.Nam
77f1aac15d Add nullability anotations
Add missing nullability for applyPayload.

Test: manual
Change-Id: Iafce9091767bd7a31937b0be329ede6639239d73
2019-09-12 11:33:39 +09:00
Yifan Hong
0cdba3256c VintfObject: Fix getHalNamesAndVersions doc
Test: CTS device info collect
Bug: 140832836
Change-Id: Iddc3c36d15370baa661e485b76c490a5d2b7815c
2019-09-11 11:07:43 -07:00
Treehugger Robot
59566aba2e Merge "Fix regression in PFD#fromData" 2019-09-09 19:21:04 +00:00
Steven Moreland
d6b5bdf07d Merge changes from topic "wait-for-aidl" into stage-aosp-master
* changes:
  PowerManagerService: use waitForService.
  ServiceManagerProxy: add APIs.
2019-08-30 17:54:37 +00:00
Aurimas Liutikas
00be951a08 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:14:44 +00:00
Steven Moreland
3ffad04add ServiceManagerProxy: add APIs.
This class is hanging around for UnsupportedApiUsage. Adding additional
APIs here which do nothing in order to satisfy the inherited interface.

Bug: 136027762
Test: compile :)
Change-Id: I47b57c6876afd77b47083bf905ade9951ff0b42d
2019-08-29 13:53:47 -07:00
Luke Huang
a3ddee80fd Merge "Support enable/disable dns forwarding of dnsmasq when start tethering"
am: 6fecb94292

Change-Id: I8f5c67fa1e045c9fd4a5e7a753df285d1111c1d2
2019-08-28 06:06:44 -07:00
Xin Li
a770df1d2e DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I94fce9c5c0b35cbb88ee27fa4cd037927964d2cd
2019-08-24 05:22:23 +00:00
Luke Huang
b0d52464f1 Support enable/disable dns forwarding of dnsmasq when start tethering
Bug: 128782815
Test: built, flashed, booted
Change-Id: Ic6ee985b42cbe77e8f2208fba62108604fc7bbcf
2019-08-20 20:42:13 +08:00
Xin Li
1702a9da19 DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
Bug: 139369544
Change-Id: I835905a51836e7218f0be8c25335b9548ae6b2d3
2019-08-13 16:36:37 -07:00
Nicolas Geoffray
6b9ab57b2d Merge "Notify the ART runtime when boot is complete."
am: f83748ae28

Change-Id: Iea67d64570657173832ee0d61288dc97af11496b
2019-08-08 05:11:55 -07:00
Nicolas Geoffray
f83748ae28 Merge "Notify the ART runtime when boot is complete." 2019-08-08 11:58:06 +00:00
David Srbecky
6d0d7066cf Notify the ART runtime when boot is complete.
Needed for jit-zygote performance improvements.

Test: device boots
Bug: 119800099
Change-Id: I1e46f49d94440384473430d8afebe29fbee9c68e
2019-08-08 07:57:35 +00:00
Nandana Dutt
b745860a3e Merge "Remove obsolete methods from DumpstateListener implementations"
am: cbdb10f982

Change-Id: Ia746b0cdadd0c4d652c373763f7a12266b080e3b
2019-08-07 07:08:27 -07:00
Nandana Dutt
47c5ecc50a Remove obsolete methods from DumpstateListener implementations
Note that with the new Bugreporting API, SystemServer is the only
expected DumpstateListener implementation. Once we fully migrate Shell
app, we can remove the implementation in BugreportService as well.

BUG: 128980174
Test: bugreport from power menu, observe progress bar

Change-Id: I40d654a70bd9ceb3a29f8a0113b85616100f4ee9
Merged-In: I40d654a70bd9ceb3a29f8a0113b85616100f4ee9
2019-08-06 17:43:11 +00:00
Dan Zhang
ea493e4c77 Merge "Fix the reference leak on RemoteCallbackList"
am: be30d27a8a

Change-Id: Ibf79be3f125ab58c8048c15f3f6f3a3e693295e7
2019-07-31 22:19:30 -07:00
Dan Zhang
be30d27a8a Merge "Fix the reference leak on RemoteCallbackList" 2019-08-01 05:03:03 +00:00
Josh Gao
cdca6b559c Merge changes I9350ec13,I809d9191,I235f727d,I1930f3ba
am: a0c949d5de

Change-Id: I1633d9eae6f162e338990766e62e3aa3873df606
2019-07-31 21:46:23 -07:00
Josh Gao
75f730abaf SharedMemory: use fdsan to protect our fd.
Bug: http://b/138422309
Test: booted, saw the GraphicsStatsService fd misacquisition
Change-Id: I9350ec13e523e1bf86797a1231769d890f277008
2019-07-31 15:19:11 -07:00
Josh Gao
9fdb8f9910 Revert "Revert "SharedMemory: break Cleaner reference cycle.""
This commit was reverted in Q because it broke things, but we want it in
master.

This reverts commit c36d0765a25d4701980738dc3e2053f19eb3d6b8.

Change-Id: I809d9191eee4909d265d2864ebd523f262f6bb61
Test: treehugger
2019-07-31 15:19:11 -07:00
Adam Seaton
9428f73436 Revert "SharedMemory: break Cleaner reference cycle."
Bug: 138422309

This reverts commit 390d9e6a18.

Reason for revert: crashes documented in b/138422309

Change-Id: I235f727d0fe87c09f6f05dddcae7759bab64dfd8
Merged-In: I235f727d0fe87c09f6f05dddcae7759bab64dfd8
(cherry picked from commit b16411f83a)
2019-07-31 15:19:11 -07:00
Josh Gao
a4a7c1a0a5 Merge "SharedMemory: clear file descriptor when explicitly closed."
am: e33db449d8

Change-Id: I699605f2c6c7f0e24f9646d692b45c71dd88fc91
2019-07-26 15:08:05 -07:00
John Reck
7f20b0d148 Fix regression in PFD#fromData
Don't rely on the GC to clean up FD resources when they can
just be cleaned up immediately. We know the MemoryFile isn't
going to be used any further, so just close it.

Bug: 138323667
Test: none
Change-Id: Ic82006c9cb48f580aaad942c4679e774186382c9
Merged-In: Ic82006c9cb48f580aaad942c4679e774186382c9
(cherry-picked from commit d201b44032cdd86177406051dcc07f4625ed3b69)
2019-07-26 14:38:49 -07:00
Adam Seaton
90a3bc3372 Revert "SharedMemory: break Cleaner reference cycle."
Bug: 138422309

This reverts commit 390d9e6a18.

Reason for revert: crashes documented in b/138422309

Change-Id: I235f727d0fe87c09f6f05dddcae7759bab64dfd8
(cherry picked from commit b16411f83a)
2019-07-26 17:35:49 +00:00
Adam Seaton
a7eed88f4e Revert "SharedMemory: clear file descriptor when explicitly closed."
Bug: 138422309

This reverts commit 20ab1e3427.

Reason for revert: crashes documented in b/138422309

Change-Id: Ic9e33fdb24bad2b30f0eb357d6752c1834df41d5
(cherry picked from commit 5966196515)
2019-07-26 17:35:35 +00:00
Josh Gao
475ca92491 SharedMemory: clear file descriptor when explicitly closed.
We run the Cleaner in close, but after the fix in commit 6ca916a6, this
no longer clears the value stored in the FileDescriptor, which means
that subsequent operations on an explicitly closed SharedMemory will
operate on a bogus fd number. Clearing the FileDescriptor value in close
is sufficient, because Cleaner.clean is idempotent, and the only other
case where it executes is when the FileDescriptor is phantom reachable,
which means no one can access it to get its integer value.

Bug: http://b/138392115
Bug: http://b/138323667
Test: treehugger
Change-Id: I8bdb4c745466532a0712976416184c53fcf0dbf6
(cherry picked from commit a7641806dd)
(cherry picked from commit 20ab1e3427)
2019-07-26 02:16:22 +00:00
Josh Gao
bc999ddb2d SharedMemory: break Cleaner reference cycle.
Previously, the Cleaner we create to close the ashmem file descriptor
used a thunk that held a strong reference to the FileDescriptor we
wanted to clean up, which prevented the Cleaner from ever running.

Break the cycle by storing the integer value of the file descriptor
instead.

Bug: http://b/138323667
Test: treehugger
Change-Id: I613a7d035892032f9567d59acb04672957c96011
(cherry picked from commit 6ca916a657)
(cherry picked from commit 390d9e6a18)
2019-07-26 02:16:16 +00:00
Josh Gao
a7641806dd SharedMemory: clear file descriptor when explicitly closed.
We run the Cleaner in close, but after the fix in commit 6ca916a6, this
no longer clears the value stored in the FileDescriptor, which means
that subsequent operations on an explicitly closed SharedMemory will
operate on a bogus fd number. Clearing the FileDescriptor value in close
is sufficient, because Cleaner.clean is idempotent, and the only other
case where it executes is when the FileDescriptor is phantom reachable,
which means no one can access it to get its integer value.

Bug: http://b/138392115
Bug: http://b/138323667
Test: treehugger
Change-Id: I8bdb4c745466532a0712976416184c53fcf0dbf6
2019-07-25 14:07:56 -07:00
Josh Gao
e9c55ddce1 Merge "SharedMemory: break Cleaner reference cycle."
am: 5783a79cfc

Change-Id: I732fac88ccee02e49506dd40a7204e5210648b10
2019-07-24 22:08:03 -07:00
Josh Gao
6ca916a657 SharedMemory: break Cleaner reference cycle.
Previously, the Cleaner we create to close the ashmem file descriptor
used a thunk that held a strong reference to the FileDescriptor we
wanted to clean up, which prevented the Cleaner from ever running.

Break the cycle by storing the integer value of the file descriptor
instead.

Bug: http://b/138323667
Test: treehugger
Change-Id: I613a7d035892032f9567d59acb04672957c96011
2019-07-24 15:40:57 -07:00
Tao Bao
eca7403bcf Merge "Add a new API applyPayloadFd() of UpdateEngine"
am: f4b0318d6f

Change-Id: I771090d681ca565392a9aaeb8ecd60026b572ae3
2019-07-13 09:39:32 -07:00
Tao Bao
f4b0318d6f Merge "Add a new API applyPayloadFd() of UpdateEngine" 2019-07-13 16:29:49 +00:00
Treehugger Robot
f0d921c41a Merge "Replace HashMap with ArrayMap for services" 2019-07-11 20:41:31 +00:00
Andrew Lewis
806f4cb16b Redact ISOBMFF boxes with 'free'
Test: atest MediaStore_Video_MediaTest android.os.RedactingFileDescriptorTest
Bug: 135499138
Change-Id: Idaa8ad30300d5427f91bb2543be3152881018cf6
(cherry picked from commit 4ec5fda3d6)
2019-07-11 19:49:48 +00:00
Kyeongkab.Nam
bcc56339bb Add a new API applyPayloadFd() of UpdateEngine
Due to the restriction of Treble, update_engine cannot access to OTA
packages located on non-core domain area.
(e.g. /data/vendor/upgrade/xxx.zip)
To solve such problem, update_engine needs to accept a file descriptor
(FD) of OTA package file instead of its URI. Accordingly, UpdateEngine
also needs to add a new interface of applyPayload which accepts FD.

Test: Manual update
Bug: 130209137
Change-Id: Ic924445c4abf27fd7dc111c74b972ac7ff9ffa6b
2019-07-09 11:21:57 +09:00
Steven Moreland
e17de65051 AIDL it! IServiceManager
Bug: 135768100
Test: boot
Change-Id: I7f8b5d07d4937804e8b0838936f8984ca7d08efa
(cherry picked from commit 7b152971e4)
2019-07-09 01:54:41 +00:00
Mathew Inwood
13ffa87a6d Merge "Restore some greylist entries." into qt-dev
am: f76bdce6e0

Change-Id: I320e33be57b8124ff7c132a67c8981d53802f8f5
2019-06-28 07:43:43 -07:00
TreeHugger Robot
f76bdce6e0 Merge "Restore some greylist entries." into qt-dev 2019-06-28 12:02:43 +00:00
Mathew Inwood
3a75f264a8 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: I5ac8b8b9b23c3789d80239cf456072cc7dfa1203
2019-06-28 10:15:37 +01:00
Tim Joines
35bc777130 Merge "Disable USAP by default on devices" into qt-dev
am: 6c3bbf9e93

Change-Id: I8195f09066a4288da76a10f5e52d44763034c3af
2019-06-27 09:17:06 -07:00
Tim Joines
6c3bbf9e93 Merge "Disable USAP by default on devices" into qt-dev 2019-06-27 16:01:43 +00:00
Lorenzo Colitti
cf545aa02a Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: bd94f0afd2
am: 92292f556b

Change-Id: If897c9c95fc8571949183c45a99a5c28cb032ebb
2019-06-27 01:31:46 -07:00
Lorenzo Colitti
8b577139ae Transfer ownership of NetworkStatsFactory to NetworkStatsService.
NetworkStatsService is the only consumer of the data coming from
NetworkStatsFactory, but the factory itself is instantiated and
owned by NetworkManagementService.

Move it into NetworkStatsService instead.

Test: atest FrameworksNetTests
Change-Id: I52df1e545c646927952579da22845a12d1d7563b
2019-06-26 19:29:51 +09:00
Tim Joines
341817e169 Disable USAP by default on devices
Test: manual, usap process missing on boot
Bug: 136003445
Change-Id: I991b24d2a386c0969bc27f9aecd6b8748b80085a
2019-06-25 09:21:45 -07:00
Daniel Rosenberg
810274ed2d Merge "Make RescueParty call vold directly" into qt-dev
am: 2618371aa5

Change-Id: I68af684fa3f8be2cc8d9518eee5bd9dbc1b118cb
2019-06-24 15:00:57 -07:00
Steven Moreland
df99ad0cf9 Merge changes Ic2e27f56,Ie19e0995 am: 95f507f80d
am: 6245e7efe6

Change-Id: Ic44dfe2b3defa6f60bee6062c049ff189223cb50
2019-06-24 14:46:25 -07:00