Commit Graph

6630 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Andrew Lewis
b8e0f62908 Merge "Redact ISOBMFF boxes with 'free'" into qt-dev
am: f68a201ebc

Change-Id: I26ca8aac1b2c29e536f8d798ada3d3b269d6dc1e
2019-07-11 06:26:47 -07:00
Andrew Lewis
65ded6c655 Merge "Redact ISOBMFF boxes with 'free'" into qt-dev
am: f68a201ebc

Change-Id: I4755c6f884958dce01e06aa5a889f06e035f1f1c
2019-07-11 06:26:42 -07:00
Andrew Lewis
4ec5fda3d6 Redact ISOBMFF boxes with 'free'
Test: atest MediaStore_Video_MediaTest android.os.RedactingFileDescriptorTest
Bug: 135499138
Change-Id: Idaa8ad30300d5427f91bb2543be3152881018cf6
2019-07-10 19:46:48 +01:00
Steven Moreland
cdc0b2d3cd Merge "AIDL it! IServiceManager" into stage-aosp-master am: 1c373c4361
am: 42762e7b4f

Change-Id: Ib1abcd696eb043072bacfd74aefae8951586f866
2019-07-09 15:36:56 -07: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
89f02cc81c Merge "Restore some greylist entries." into qt-dev am: f76bdce6e0
am: 13ffa87a6d

Change-Id: I4c92e5685804a5b03510ab5b9396c0dc6f4aad46
2019-06-28 08:49:28 -07:00
Mathew Inwood
68d07b7d6b Merge "Restore some greylist entries." into qt-dev
am: f76bdce6e0

Change-Id: I7636cbdbd4177461c56103a6a8e7d87498c9ba13
2019-06-28 08:19:19 -07: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
f2527bbc60 Merge "Disable USAP by default on devices" into qt-dev am: 6c3bbf9e93
am: 35bc777130

Change-Id: Ib7a037e51b3a007a942fb877cb09d2c890021596
2019-06-27 10:49:44 -07:00
Lorenzo Colitti
d1d1e36e67 Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: bd94f0afd2 am: 92292f556b
am: cf545aa02a

Change-Id: Ibe2fcacb3779b3c6bc484fe6f398475bf5b6383b
2019-06-27 09:26:02 -07:00
Tim Joines
4ecc6562f6 Merge "Disable USAP by default on devices" into qt-dev
am: 6c3bbf9e93

Change-Id: I131b75b45e43b185266ebb54f49815896fc67ffe
2019-06-27 09:22:21 -07: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
Michael Wright
3a0f715588 Merge "Ignore DND when FLAG_BYPASS_INTERRUPTION_POLICY is set." into qt-r1-dev
am: 3af0a7b5e5

Change-Id: I4942abf90c783c67f0a32dbbc018a6a3e4d1c76e
2019-06-25 13:50:46 -07:00
TreeHugger Robot
3af0a7b5e5 Merge "Ignore DND when FLAG_BYPASS_INTERRUPTION_POLICY is set." into qt-r1-dev 2019-06-25 19:49:32 +00: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
Michael Wright
7f378787dc Ignore DND when FLAG_BYPASS_INTERRUPTION_POLICY is set.
When DND is on, it sets AppOps to return MODE_IGNORED for any non-touch
vibrations. Unfortunately, this means it blocks critical vibrations as
well, like emergency alerts. In order to avoid this, we need to respect
FLAG_BYPASS_INTERRUPTION_POLICY when set on the vibration attributes.

Bug: 132112663
Bug: 135686242
Test: Manual
Change-Id: I59465eed057b077a4c0548af162e0fec1c29afdc
2019-06-25 16:57:10 +01:00
Daniel Rosenberg
2c8d9ec6d9 Merge "Make RescueParty call vold directly" into qt-dev am: 2618371aa5
am: 810274ed2d

Change-Id: Ibe6be230b5417cec8428516f6edbead1b0146976
2019-06-24 15:05:48 -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
Daniel Rosenberg
db5894d5a9 Merge "Make RescueParty call vold directly" into qt-dev
am: 2618371aa5

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

Change-Id: I0aa2d7bda198ff9bd73e173eb3d54f7f748ba8dc
2019-06-24 14:50:06 -07:00
Steven Moreland
df99ad0cf9 Merge changes Ic2e27f56,Ie19e0995 am: 95f507f80d
am: 6245e7efe6

Change-Id: Ic44dfe2b3defa6f60bee6062c049ff189223cb50
2019-06-24 14:46:25 -07:00
Daniel Rosenberg
d078d8b15c Make RescueParty call vold directly
This changes RescueParty to call vold over binder directly for
Checkpointing related calls. It turns out that if the system is in a bad
enough state, the other method would not work, as some of the services
required would not be running.

Bug: 135558798
Test: setprop persist.sys.enable_rescue 1
      setprop debug.crash_system 1 or setprop debug.crash_sysui 1
      vdc checkpoint startCheckpoint 3
      stop
      start
      Device should go through the rescueparty flow, and reboot.
      Repeat without checkpoint. Device should prompt reboot.

Change-Id: I8b11d68075cc291e9557d524bc87b54d17b370e4
2019-06-24 13:23:27 -07:00
Steven Moreland
f54791b388 Remove references to setPermissionController.
This method isn't implemented/used/etc..

Bug: 135768100
Test: TH
Change-Id: Ic2e27f5685cc16562815fcaf1226bc7789f8d882
2019-06-21 18:51:07 -07:00