Commit Graph

6752 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
TreeHugger Robot
fd0082b723 Merge "Move reading time field to inside HistoryItem.readFromParcel()." 2019-07-10 01:23:32 +00: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
Jeongik Cha
9ec059ac1d Support /system_ext partition
This commit is mainly from I7a6a30bf8e8db9f2738594d187bb9148f138b8da, so
test cases and features are mostly same.

We change product_services partition name to "system_ext" because this
partition's purpose changes.

 - installing a RRO package for framework from /system_ext/overlay
 - installing apps from /system_ext/app
 - installing priv-apps from /system_ext/priv-app
 - installing permissions from
   /system_ext/etc/[default-permissions|permissions|sysconfig]

Bug: 134359158
Test: `mma` under frameworks/base/tests/[libs|privapp]-permissions
      adb sync && adb reboot
      adb shell cmd package list libraries
        => confirmed com.android.test.libs.system_ext library
      adb shell cmd package dump \
        com.android.framework.permission.privapp.tests.system_ext
        => confirmed that the package is a priv-app

Change-Id: Ibbccbba64156a7bc464ffb3785fb8fe69ebb973c
2019-07-09 23:55:37 +09: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
Nicolas Geoffray
9abc6d098a Remove time delay for usap process in jit zygote mode.
Not needed anymore now that all processes share the same JIT code.

Bug: 119800099
Test: boots
Change-Id: Icbc85e385f43c0dc1a273d6da271dfe47c8e12b8
2019-07-05 15:58:42 +01:00
Hui Yu
cb99610483 Move reading time field to inside HistoryItem.readFromParcel().
Also HistoryItem does not need to implement Parcelable interface,
just like other batterystats classes, readFromParcel() and
writeToParcel() are pair of symmetric methods, but those classes do
not implement Parcelable interface because readFromParcel() is not a
method of readFromParcel() interface.

Change-Id: I5ac974c9903c5639a6bb52fc0a53367f92187af0
Fix: 135442392
Test: reboot device and "adb shell dumpsys batterystats"
2019-07-02 21:57:24 +00:00
Steven Moreland
f66da1e5a7 Merge "AIDL it! IServiceManager" 2019-07-02 20:04:09 +00:00
Mathew Inwood
46f7f16a4d Merge "Restore some greylist entries." into qt-dev am: f76bdce6e0 am: 13ffa87a6d
am: 89f02cc81c

Change-Id: Ib5bc4e76d81ad69f7c3293e6cb72393e1aee7ed9
2019-06-28 09:36:40 -07: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