Commit Graph

6768 Commits

Author SHA1 Message Date
Artur Satayev
70507ed5a1 Add @UnsupportedAppUsage annotations for max-p.
See go/UnsupportedAppUsage for more details.

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-08-01 19:46:29 +01:00
Dan Zhang
99c738bb94 Merge "Fix the reference leak on RemoteCallbackList" am: be30d27a8a am: ea493e4c77 am: dbf00b6a0b am: c8029bfbc3
am: 88d4bf0964

Change-Id: Ie51d3979ff7b74068203a43a85dd56a8a9e693e7
2019-08-01 09:50:52 -07:00
Dan Zhang
c8029bfbc3 Merge "Fix the reference leak on RemoteCallbackList" am: be30d27a8a am: ea493e4c77
am: dbf00b6a0b

Change-Id: If49b4ffddb6e578d82c1ad4b6c26f8153bb48a3a
2019-08-01 00:58:51 -07:00
Dan Zhang
dbf00b6a0b Merge "Fix the reference leak on RemoteCallbackList" am: be30d27a8a
am: ea493e4c77

Change-Id: Iffc4beb2fd5c30a35a744c133186826cd7f487b8
2019-08-01 00:37:46 -07: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
John Reck
51969a1758 Merge "Fix regression in PFD#fromData" into qt-r1-dev am: 1775a48935 am: 1efbccc58d
am: 524d0b6f8c

Change-Id: I8bd5bd2d779fe838b5c53481e1989be7e7847d3e
2019-07-29 16:15:28 -07:00
John Reck
524d0b6f8c Merge "Fix regression in PFD#fromData" into qt-r1-dev am: 1775a48935
am: 1efbccc58d

Change-Id: Ifa8cc2718ec176143c835c824c09cccb747914b0
2019-07-29 15:35:14 -07:00
John Reck
c3ca72ca5b Merge "Fix regression in PFD#fromData" into qt-r1-dev
am: 1775a48935

Change-Id: Icf8fb72af14eb1cd16765a36e9fca4f9f5fdb265
2019-07-29 15:10:04 -07:00
John Reck
1775a48935 Merge "Fix regression in PFD#fromData" into qt-r1-dev 2019-07-29 21:23:57 +00:00
bsears
4dcd747290 Merge "Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev am: d4b0c9348a am: 868ac4f3a1 am: a53549d307" into qt-qpr1-dev-plus-aosp
am: 6ea7d84278

Change-Id: Ie92c672911f824a9650dd89fba94a9aa6dc87b0e
2019-07-26 17:54:19 -07:00
bsears
da5d7a7b03 Merge "Revert "SharedMemory: clear file descriptor when explicitly closed." Bug: 138422309" into qt-dev am: 480f1db9bc am: 87216d7403 am: d15de9d187
am: 4432f424d6

Change-Id: I20c604b9c40423525988376769d2a1cb81926064
2019-07-26 17:23:20 -07:00
bsears
393caff3cb Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev am: d4b0c9348a am: 868ac4f3a1
am: a53549d307

Change-Id: Ie7a0f95a0b260ecfdaf74d9637363c40b0550142
2019-07-26 17:20:07 -07:00
bsears
206ab727cf Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev am: d4b0c9348a
am: b0e003f2c8

Change-Id: Icf894b94730571311439360533cfdc6ffca227f2
2019-07-26 17:12:20 -07:00
bsears
d15de9d187 Merge "Revert "SharedMemory: clear file descriptor when explicitly closed." Bug: 138422309" into qt-dev am: 480f1db9bc
am: 87216d7403

Change-Id: Ie6221fa2e0069b28284c37eea0a90327dd7164d6
2019-07-26 16:55:22 -07:00
bsears
b0e003f2c8 Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev
am: d4b0c9348a

Change-Id: Ic8ff79117a25be51cccf4e1492e3dea87a045eb5
2019-07-26 16:36:19 -07:00
bsears
868ac4f3a1 Merge "Revert "SharedMemory: break Cleaner reference cycle." Bug: 138422309" into qt-dev
am: d4b0c9348a

Change-Id: Icef464ff04de9d1e300161383251e35d557ca973
2019-07-26 16:35:31 -07:00
bsears
de6bfd230c Merge "Revert "SharedMemory: clear file descriptor when explicitly closed." Bug: 138422309" into qt-dev
am: 480f1db9bc

Change-Id: Ib346fb19a7be0635fe9e15d0fc6a307a614fb1c5
2019-07-26 16:31:52 -07:00
bsears
87216d7403 Merge "Revert "SharedMemory: clear file descriptor when explicitly closed." Bug: 138422309" into qt-dev
am: 480f1db9bc

Change-Id: I3ba90a97cc16bcf29c15073c252c382450ae4a71
2019-07-26 16:31:40 -07:00
John Reck
12ea937f8f 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: Repro steps in bug. Verified addresses FD leak in system_server from repeatedly opening & closing settings.
Change-Id: Ic82006c9cb48f580aaad942c4679e774186382c9
2019-07-26 23:19:05 +00: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
Adam Seaton
b16411f83a Revert "SharedMemory: break Cleaner reference cycle."
Bug: 138422309

This reverts commit 390d9e6a18.

Reason for revert: crashes documented in b/138422309

Change-Id: I235f727d0fe87c09f6f05dddcae7759bab64dfd8
2019-07-26 17:17:16 +00:00
Adam Seaton
5966196515 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
2019-07-26 17:17:03 +00:00
Josh Gao
6743603eee Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f am: 036d594c69 am: 4a99f4ca90
am: b8b30294e2

Change-Id: Ide601366897bb84bb00ae6db4e922311a399f625
2019-07-25 18:09:49 -07:00
Josh Gao
b8b30294e2 Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f am: 036d594c69
am: 4a99f4ca90

Change-Id: If1ca5d391b6cfa6262561110bd39ce2287d694d3
2019-07-25 17:44:29 -07:00
Josh Gao
655d6f5cde Merge changes I8bdb4c74,I613a7d03 into qt-dev
am: a09ee2d39f

Change-Id: Ibcbc22b6f4f77825f16e52a832e28fcb40d3fa6d
2019-07-25 17:41:26 -07:00
Josh Gao
de90a881a7 Merge changes I8bdb4c74,I613a7d03 into qt-dev am: a09ee2d39f
am: 036d594c69

Change-Id: Ib925304a870e5d9881147eaa9831e57be4dda6a9
2019-07-25 17:33:51 -07:00
Josh Gao
036d594c69 Merge changes I8bdb4c74,I613a7d03 into qt-dev
am: a09ee2d39f

Change-Id: I6ae25d6b3aa39ef6f9ed1ffcf6fce6e5920a5578
2019-07-25 16:54:20 -07:00
Josh Gao
20ab1e3427 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)
2019-07-25 14:08:58 -07: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
390d9e6a18 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)
2019-07-25 12:13:15 -07:00
Josh Gao
e045fc0fe4 Merge "Merge "SharedMemory: break Cleaner reference cycle." am: 5783a79cfc am: e9c55ddce1 am: 132b66b0c2" into qt-r1-dev-plus-aosp am: 5b8cf85d76
am: 6e2186ba9b

Change-Id: I77bb30cea29bc719e8c65849374799fc70636879
2019-07-24 23:23:05 -07:00
Josh Gao
90cc26920b Merge "SharedMemory: break Cleaner reference cycle." am: 5783a79cfc am: e9c55ddce1
am: 132b66b0c2

Change-Id: Ide4fbc059ceabf2028d57f5e5a9e7358dd88e7e5
2019-07-24 22:28:37 -07:00
Josh Gao
132b66b0c2 Merge "SharedMemory: break Cleaner reference cycle." am: 5783a79cfc
am: e9c55ddce1

Change-Id: I8444786cdde94c75e3711349bad812d514a58890
2019-07-24 22:17:45 -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
Eric Jeong
e7ead1ba88 Add isHeadlessSystemUserMode() to UserManager
- isHeadlessSystemUserMode() returns whether the device is running with
headless system user (go/multi-user-headless-user0)
- RoSystemProperties.MULTIUSER_HEADLESS_SYSTEM_USER is replaced by
isHeadlessSystemUserMode()

Bug: 137755681
Test: Bluetooth service and Network policy manager should work fine with
headless system user. A profile user should be created with headless
system user.

Change-Id: Ic48d98426f7a5ea47dde2008ae51f78855f622e6
2019-07-19 15:10:04 -07:00
Jeongik Cha
168267660f Merge changes from topic "system_ext"
* changes:
  Consider overlay in system_ext as system's
  Support /system_ext partition
2019-07-17 10:24:58 +00:00
Tao Bao
61b85236c9 Merge "Add a new API applyPayloadFd() of UpdateEngine" am: f4b0318d6f am: eca7403bcf am: c009d8e067
am: 7c8feecd92

Change-Id: Ia44aa20a864e2db5af1aa096a382d5537326793d
2019-07-13 10:07:00 -07:00
Tao Bao
7c8feecd92 Merge "Add a new API applyPayloadFd() of UpdateEngine" am: f4b0318d6f am: eca7403bcf
am: c009d8e067

Change-Id: I1f464891e522c58bfc0aa958a5fed1e00bbc01d2
2019-07-13 09:57:29 -07:00
Tao Bao
c009d8e067 Merge "Add a new API applyPayloadFd() of UpdateEngine" am: f4b0318d6f
am: eca7403bcf

Change-Id: I39b71250baaf7796af4fca4d875ed338a3985f96
2019-07-13 09:47:38 -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
a23fd49656 Merge "Redact ISOBMFF boxes with 'free'" into qt-dev am: f68a201ebc am: b8e0f62908
am: 17a248a7ec

Change-Id: I4d0c0c79d88446f3b4ec748d5c8993fde8c624d7
2019-07-11 06:50:43 -07:00
Andrew Lewis
17a248a7ec Merge "Redact ISOBMFF boxes with 'free'" into qt-dev am: f68a201ebc
am: b8e0f62908

Change-Id: Icacc228d3e473e2f1fea2ff68753064bf4f6ccd6
2019-07-11 06:38:34 -07:00