Commit Graph

5518 Commits

Author SHA1 Message Date
Nick Kralevich
558bf26377 Merge "NativeHandle.java: dup() with O_CLOEXEC" am: 760e074e50
am: d5a101dd7f

Change-Id: If4b615a9a2d35d4f9c294bffa470fe6aed90a9f6
2018-12-18 11:46:53 -08:00
Ken Chen
d8dec0ca80 Merge "Remove 'hasDns' parameter" am: 3176e8be7a
am: c7af83f4ff

Change-Id: I43080dc7922ab6b8b1c61f7a2542dd8cead45bc5
2018-12-18 10:50:11 -08:00
Treehugger Robot
760e074e50 Merge "NativeHandle.java: dup() with O_CLOEXEC" 2018-12-18 18:36:35 +00:00
Ken Chen
3176e8be7a Merge "Remove 'hasDns' parameter" 2018-12-18 11:17:27 +00:00
Nick Kralevich
1de009645c NativeHandle.java: dup() with O_CLOEXEC
Don't use Os.dup(), as it creates file handles which leak across exec()
boundaries. Instead, use fcntl(F_DUPFD_CLOEXEC);

O_CLOEXEC is essential for ensuring that file descriptors do not leak
across an exec() boundary. Setting O_CLOEXEC ensures that file
descriptors can't linger around unnecessarily in an exec()ed process
which doesn't use them, making more efficient use of resources.
Additionally, O_CLOEXEC is important in ensuring that untrusted
exec()ed code cannot take advantage of leaked file descriptors.

Test: Android compiles and boots
Bug: 120983106
Change-Id: I99a66834cc6b9bb25e1b4daf75384ec6a91ae9e2
2018-12-17 14:48:35 -08:00
Inseob Kim
ccc7473fb5 Schematize vold system properties
am: 0a91222c83

Change-Id: I3462d493bf88d7a435573659af9d8fa2062723b0
2018-12-13 16:14:18 -08:00
Inseob Kim
0a91222c83 Schematize vold system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: I8e04f643197b6c8a60cc38c6979e41c5de3469f5
Merged-In: Iedfd3c1dda665006ea5410ee787c3ca447ac7db1
(cherry picked from commit c1246e6c36)
2018-12-13 15:35:34 -08:00
Andrew Solovay
b2ad787a44 Merge "docs: Fixing malformed @links" into pi-dev
am: 39f74d5732

Change-Id: Iaf4fefbba3e1e76b348923ba9501107b2439ac1a
2018-12-13 09:35:03 -08:00
Treehugger Robot
a32f898720 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" 2018-12-13 05:45:20 +00:00
Andrew Solovay
8a788f4094 docs: Fixing malformed @links
Several @link javadoc directives were malformed, resulting in the
Javadoc code being output to the HTML.

Staged to:

http://go/dac-stage/reference/android/app/Activity
http://go/dac-stage/reference/android/app/RemoteInput
http://go/dac-stage/android/os/UserManager

Bug: 120743732
Test: make ds-docs
Change-Id: I2c00c7e1e3adcff696e6d000206aeeaea61e7ecd
Exempt-From-Owner-Approval: Doc-only change
2018-12-12 16:36:14 -08:00
Adrian Roos
d4f9f9f666 Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" am: af0e1c2fa5
am: 963172ac83

Change-Id: I2251db66ef73d5b69c84b4e83f2788d2bc953eda
2018-12-12 08:44:43 -08:00
Adrian Roos
963172ac83 Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi"
am: af0e1c2fa5

Change-Id: I016cacee1e1de6c7a8269fc3605ed25716598d9e
2018-12-12 08:33:17 -08:00
Adrian Roos
6115769c16 API: Clean up redundant and ineffective usages of SystemApi and TestApi
Everything that is marked SystemApi or TestApi, but not @hide is still
part of the public SDK, it is therefore not sound to have that combination.

In the future, specifing such a combination will be considered an error
to prevent inadvertently exposing SystemApi and TestApi as public API.

Bug: 115333477
Change-Id: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Merged-In: Ibd5d6a22862fdbc1e20a1cb3925280f5a682edea
Test: METALAVA_PREPEND_ARGS="--error UnhiddenSystemApi" m checkapi
Exempt-From-Owner-Approval: API cleanup
2018-12-12 15:02:26 +01:00
Lorenzo Colitti
94cffb3a6c Merge changes from topic "netd-event-listener-aidl" am: 481251a0c2
am: 379029671a

Change-Id: Ib7997a04d767635952c72c41096d6d500edf2c49
2018-12-11 23:04:16 -08:00
Lorenzo Colitti
379029671a Merge changes from topic "netd-event-listener-aidl"
am: 481251a0c2

Change-Id: I6ee2f333c2d68c8542070f48ffac83d38e36d217
2018-12-11 22:55:00 -08:00
Lorenzo Colitti
481251a0c2 Merge changes from topic "netd-event-listener-aidl"
* changes:
  Depend on the stable AIDL version of the netd metrics interface.
  Delete INetworkManagementService#getNetdService.
2018-12-12 06:17:25 +00:00
Xin Li
15b123ef45 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: Idc8bfb6d97a869b76cfb87ca1a494201baf9e8bd
2018-12-11 14:13:44 -08:00
TreeHugger Robot
b73bb94aeb Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master 2018-12-11 21:49:22 +00:00
Treehugger Robot
9dfd13e7ea Merge "Revert "Revert "Schematize vold system properties""" 2018-12-11 11:04:01 +00:00
Lorenzo Colitti
d8a70b671b Delete INetworkManagementService#getNetdService.
This code is unused.

Test: builds, boots
Test: atest frameworks-net
Change-Id: I45e796c0dd049e8ac722cc79eea8df81dd2ad28c
2018-12-11 19:39:04 +09:00
Jordan Liu
ec098703ef Merge "Return "" not "null"" am: eebbd2b639
am: edaf4401e1

Change-Id: Id4c2bf04e877664188c8fab2905601d6f431cfde
2018-12-10 17:44:53 -08:00
Inseob Kim
5b1cc27cee Revert "Revert "Schematize vold system properties""
This reverts commit 2473b08b07.

Reason for revert: Fixed build breakage
sysprop_cpp and sysprop_java directly have been linking against
libprotobuf-cpp-full and do not set proto.type field, which could
cause ASAN error due to linking against both libproto version of full
and lite.

Change-Id: I96eb47444d7b6f6b5fef092efc1514fcdd6f33b6
Merged-In: I8e04f643197b6c8a60cc38c6979e41c5de3469f5
2018-12-11 00:23:07 +00:00
Xin Li
75f75c18cc DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
Bug: 120502534
Change-Id: I7351a1832c4bd2fd86324183ab83e9088d716822
2018-12-10 12:30:19 -08:00
Seongho Kim
73273e0caa Return "" not "null"
Some models such as LDU, WIFI do not have "gsm.version.baseband",
which should return "null" when it is called.
However it returns "" not "null"

Bug: 120685535
Test: Self-Test
Change-Id: Idc1363d45a0ece3a35f46da287e21015ac1387af
2018-12-08 01:34:04 +00:00
Anthony Stange
d2ca6c6dfe Merge "Revert "Schematize vold system properties"" am: 6ee45c6f14
am: 510c8c463f

Change-Id: If137d417a8f042e8cbde842578caaa3e54bb8c6d
2018-12-07 04:37:45 -08:00
Anthony Stange
6ee45c6f14 Merge "Revert "Schematize vold system properties"" 2018-12-07 12:04:56 +00:00
Anthony Stange
2473b08b07 Revert "Schematize vold system properties"
This reverts commit 7bc31dc162.

Reason for revert: Breaking aosp_master build.

Change-Id: I34a5e9889c17e3454a0a86deabcec3c192a3da52
2018-12-07 11:43:03 +00:00
Inseob Kim
1a7cad6b1a Merge "Schematize vold system properties" am: 095d0f640e
am: 73694f8faa

Change-Id: If420ffa861d9d85f2baca9224b96f2716965f4b5
2018-12-06 18:42:29 -08:00
Treehugger Robot
095d0f640e Merge "Schematize vold system properties" 2018-12-07 01:46:45 +00:00
cken
bed368e3cb Remove 'hasDns' parameter
Netd use this parameter to determine which network it should use for
DNS query when VPN is enabled. But it is no more reliable when we have
seamless vpn handover, since the parameter does not make update to
netd if we have DNS configuration change. Netd should call resolver
API to get latest DNS information rather than this one.

Bug: 116539103
Test: runtest frameworks-net passes
Change-Id: I6491114ab6de0ff66322f1da69056e6f3c999b5a
2018-12-06 10:25:28 +09:00
Inseob Kim
7bc31dc162 Schematize vold system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: I8e04f643197b6c8a60cc38c6979e41c5de3469f5
Merged-In: I8e04f643197b6c8a60cc38c6979e41c5de3469f5
2018-12-05 00:04:24 +00:00
Andrew Solovay
8a30c09238 Merge "docs: Removing @see link to hidden field" into pi-dev
am: 807672ac4f

Change-Id: If1d5759ea1f2fe0656e298c2d67d3f817158ebba
2018-11-20 11:08:29 -08:00
Andrew Solovay
6fe332c07e docs: Removing @see link to hidden field
Docs had contained a @see link to #FIRST_SDK_INT , but that field
had a @hide directive, so the @see link resulted in an error message
in the output.

Doc staged to:

http://go/dac-stage/reference/android/os/Build.VERSION#SDK_INT

Bug: 80445154
Test: make ds-docs
Change-Id: Id8d461c517bd4d8b3c49b61da37ec0a16768a63d
Exempt-From-Owner-Approval: Doc-only change
2018-11-19 23:02:47 +00:00
Hirono Shiyama
a3e91325a6 Merge "[BatteryStats] Correct formatter for pkginst in battery stats." am: 2c250e322b
am: b6aa42807c

Change-Id: I53c8883ef14106d5bda42f1361af3e7153dd9ad1
2018-11-14 16:31:19 -08:00
Treehugger Robot
2c250e322b Merge "[BatteryStats] Correct formatter for pkginst in battery stats." 2018-11-14 23:53:42 +00:00
Steven Moreland
19e666a4fc Merge "ParcelFileDescriptor: warn about comm int coupling." am: 22350fbefb
am: 74090dbefa

Change-Id: I916b81bcf0388316adb3dc8a79a4e03168eca661
2018-11-14 13:29:12 -08:00
Steven Moreland
22350fbefb Merge "ParcelFileDescriptor: warn about comm int coupling." 2018-11-14 17:41:49 +00:00
Ryo Hashimoto
6c9537dc7f Merge changes from topic "appfuse-upstr" am: a2786c1f53
am: af57e83d44

Change-Id: I1287540b7265c96344cb91eb2119fc59919dc2c9
2018-11-14 00:10:11 -08:00
Steven Moreland
3de571e1fc ParcelFileDescriptor: warn about comm int coupling.
If these values are ever changed (or their parceling), we'll also need
to update libbinder.

Bug: 115607973
Test: N/A
Change-Id: Id9c594ea039687855047c005a0c3a9bfe0002732
2018-11-14 01:00:01 +00:00
Risan
2c0da88382 Add FileUtils.translateModePfdToPosix
Bug: 72017414, 110379912
Test: manual with appfuse
Change-Id: I92b2f8995c1e011ff3fbc5c5a55d8c5793e2b5cf
Merged-In: I94373055468d279e6553d4a038267732b9b53745
2018-11-13 22:44:36 +00:00
Andreas Gampe
a1974bbe6d Merge changes Idbacb6ad,I4e06b3f9,Iffcbbb82 am: 0f9a09d8ba
am: e15b2d5896

Change-Id: I50b0c5785656ba5561083aec8901267baee99c2a
2018-11-13 14:29:39 -08:00
Treehugger Robot
0f9a09d8ba Merge changes Idbacb6ad,I4e06b3f9,Iffcbbb82
* changes:
  BinderProxy: Fix up differences
  Move proxy debug info dumping back to Java.
  Dump top binder proxy interface names in dumpsys.
2018-11-13 22:01:56 +00:00
Risan
ee32e0d473 Merge "Introducing StubVolume in StorageManager" am: b499af866c
am: eb871cc916

Change-Id: I69240d32659b511aec0e1e029fb6c6f1ab455c9c
2018-11-13 11:57:12 -08:00
Treehugger Robot
b499af866c Merge "Introducing StubVolume in StorageManager" 2018-11-13 19:20:38 +00:00
Andreas Gampe
460ff1416b BinderProxy: Fix up differences
Fix up resolves to minimize differences to internal code.

Test: m
Change-Id: Idbacb6ad14c43aff8030d70b5e17427b86e92d6e
Merged-In: I4e06b3f93e30ed1c7868ec9e018709a7e796e441
2018-11-12 16:15:31 -08:00
Martijn Coenen
c1493b283b Move proxy debug info dumping back to Java.
This had to be called from native because serialization
was done from native, but now that serialization is in Java
we can move this back to a more logical place.

Also, this allows us to dump the per-UID proxy counts in
this situation again.

Bug: 109888955
Test: sailfish builds, proxy debug info shown on hitting limits
Merged-In: I4e06b3f93e30ed1c7868ec9e018709a7e796e441
Change-Id: I4e06b3f93e30ed1c7868ec9e018709a7e796e441
2018-11-12 16:08:45 -08:00
Martijn Coenen
345d4c16bb Dump top binder proxy interface names in dumpsys.
To facilitate real-time debugging.

Bug: 109888955
Test: builds, adb shell dumpsys activity binder-proxies shows output
Merged-In: Iffcbbb824f4050b6fb8f556c8b4d09115e53da18
Change-Id: Iffcbbb824f4050b6fb8f556c8b4d09115e53da18
2018-11-12 14:47:12 -08:00
Josh Gao
a355924be3 Merge "Close PFD.AutoClose{In,Out}putStream before the PFD itself." am: 8fe23dfeff
am: dcf129f380

Change-Id: I6926ff23f7360ba2acf2b87dff1b20c548d7d0d4
2018-11-12 13:12:13 -08:00
Josh Gao
401fb2485a Close PFD.AutoClose{In,Out}putStream before the PFD itself.
Bug: http://b/118316956
Test: atest ParcelFileDescriptorTest
Test: atest ParcelFileDescriptor_AutoCloseOutputStreamTest
Change-Id: I39c5b15ea8ac5915e4f5e4e42328cd08f65ec9a0
2018-11-09 14:10:33 -08:00
Risan
05c41e6a0a Introducing StubVolume in StorageManager
Bug: 110380403
Test: Tested in ARC++ (with Settings and vold changes in separate CLS)
- able to see the external storage under StorageSettings. Also tested
the sm command to print stubvolumes.

Change-Id: I7517260a40399bd9800424bb394512601f6af617
2018-11-08 21:48:35 +00:00