OSDN Git Service
Andreas Gampe [Thu, 7 Jun 2018 16:42:02 +0000 (09:42 -0700)]
Framework: Disable native-bridge for non-zygote
Non-zygotes may not have the permissions/capabilities to run a
bridge and may abort attempts to load a bridge because of seccomp
rules. So don't tell the runtime to load a bridge when starting
a non-zygote.
Bug:
77878177
Bug:
80118963
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I7894b89feec79e4bd478f649c004ad29fc46597e
Neil Fuller [Thu, 7 Jun 2018 15:50:06 +0000 (15:50 +0000)]
Merge "Remove CommonClock / CommonTimeManagementService"
Treehugger Robot [Thu, 7 Jun 2018 11:27:25 +0000 (11:27 +0000)]
Merge "com.android.mediadrm.signer is built with java_sdk_library"
Tyler Gunn [Wed, 6 Jun 2018 21:19:04 +0000 (21:19 +0000)]
Merge "Ensure self-managed calls use voip audio mode."
Neil Fuller [Mon, 4 Jun 2018 14:35:31 +0000 (15:35 +0100)]
Remove CommonClock / CommonTimeManagementService
The service and associated code is unused.
Bug:
80462439
Test: build / boot
Merged-In: Ibdfab1b7d2951a0c45e07bd47850af037990841b
Change-Id: Ibdfab1b7d2951a0c45e07bd47850af037990841b
Chalard Jean [Wed, 6 Jun 2018 08:25:45 +0000 (08:25 +0000)]
Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ...
* changes:
Let tests enumerate all transports/capabilities.
Destroy networks as soon as they are disconnected.
Fix a ConcurrentModificationException crash.
Unify behavior of various cases of "no underlying networks"
Fix: VPNs update caps upon underlying network disconnect.
Add tests for setUnderlyingNetworks.
Fix setCapabilities.
Fix SSID not being logged by the validation logs
Make sure getActiveNetwork is consistent with default callbacks
Add tests for getActiveNetwork.
Guard the SSID with NETWORK_SETTINGS
Add a new ssid field in NetworkCapabilities.
Notif manager and captive portal app to read SSID again
Remove unwanted capability from the java-doc
Actually @hide unwanted capability methods.
API council requested tweaks to NetworkRequest.
Add OEM_PAID capability to system api
add airplane mode shell commands to connectivity
Enable cleartext for captive portal apps
Expose CONNECTIVITY_ACTION to Instant Apps
fix isActiveNetworkMetered with VPNs
Jeff Sharkey [Mon, 14 May 2018 19:49:07 +0000 (13:49 -0600)]
Let tests enumerate all transports/capabilities.
This gives them a way to collect all included values without
resorting to manual probing of each newly added value.
Cherry-pick of ag/
4052941 with minor conflicts in the imports.
Bug:
16207332
Test: atest com.android.cts.net.HostsideVpnTests
Change-Id: Ia764b3412bf834890612378e0c3846913f4e0a06
Merged-In: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0
Merged-In: If07e77c92046807235229a4f67ee087bdd7bccf1
Chalard Jean [Fri, 11 May 2018 11:19:20 +0000 (20:19 +0900)]
Destroy networks as soon as they are disconnected.
...as opposed to after the async channel finished disconnecting.
Clean cherry-pick of ag/
4043255
Bug:
78308259
Test: runtest frameworks-net
also used a device with this patch over the weekend and
tried all I could think of
Merged-In: Ic4c7520e907de353a01c2a3a8a50d661dee4a994
Merged-In: I0617f0ff6e46a1d3764335a1e7ad01b34c8cc5a8
Change-Id: I4e4b41bbdf25d7d7bea4124cb58da004d47f1090
Chalard Jean [Wed, 23 May 2018 00:07:51 +0000 (09:07 +0900)]
Fix a ConcurrentModificationException crash.
This is a pinpoint fix against the bug listed below. While a client
is synchronously reading the LinkProperties of a network, the
ConnectivityServiceThread is updating its properties. Make sure
that update is done atomically.
This is a stopgap countermeasure against a problem that is
pervasive with usage of LinkProperties, but fixing the problem
itself will happen later.
Clean cherry-pick of ag/
4174798
Bug:
80077223
Test: runtest frameworks-net
Change-Id: I61b262d824c98b4ced36395a597b73de9193a199
Merged-In: I25007ac26349e451bb47f966af70d590d699c347
Merged-In: I03526187645b6955eb89ca4d2e4a930ebac236b8
Chalard Jean [Mon, 21 May 2018 06:30:56 +0000 (15:30 +0900)]
Unify behavior of various cases of "no underlying networks"
Before this change, VPNs having no underlying networks would be
marked as metered as the safe option, but VPNs having only
disconnected underlying networks would be marked as unmetered.
Fix this discrepancy.
Clean cherry-pick of ag/
4113809
Bug:
79748782
Test: runtest frameworks-net
Change-Id: Ie6ace6bd95139605ffcfa8cd6c15cf28f8fa28c8
Merged-In: If19b85325e7d684e645470293b3c8a674084c641
Merged-in: I22f80a6a39d4a19ff74aa61fcbd66f1a041b1003
Chalard Jean [Fri, 18 May 2018 13:02:56 +0000 (22:02 +0900)]
Fix: VPNs update caps upon underlying network disconnect.
Clean cherry-pick of ag/
4083954
Bug:
79748782
Test: ConnectivityServiceTests still pass
Change-Id: I21e866c723099e5c3dee54ff13e830d44427fc7a
Merged-In: I12c948ebeb2b74290908f8320ff77220dc4a9fb9
Chalard Jean [Fri, 18 May 2018 12:47:45 +0000 (21:47 +0900)]
Add tests for setUnderlyingNetworks.
Fixes come later. This is complex enough as it is.
Clean cherry-pick of ag/
4083953
Bug:
79748782
Test: new test passes, old tests still pass
Change-Id: If7276fe1f751be7b9c18f689e97699e566e5bde0
Merged-In: I12c948ebeb2b74290908f8320ff77220dc4a9fb9
Chalard Jean [Fri, 18 May 2018 14:48:49 +0000 (23:48 +0900)]
Fix setCapabilities.
P introduced setSSID, UIDs and unwanted capabilities.
None of these exhibit commutative behavior through combineCapabilities
because their semantics don't allow it. Therefore
NetworkRequest.setCapabilities() is badly broken around any of
these. Look at the comments in the new tests to realize the
extent of the damage.
Clean cherry-pick of ag/
4083952
Bug:
79748782
Test: new tests written, old tests pass
Change-Id: Iafe074126132a82af37f4bf056c4a7b8d56bdc83
Merged-In: Ia5bebf8a233775367bbf1b788870528934ecbcfb
Merged-In: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1
Chalard Jean [Thu, 26 Apr 2018 07:16:10 +0000 (16:16 +0900)]
Fix SSID not being logged by the validation logs
Also add it in the logs of the notification manager.
Clean cherry-pick of ag/
4022397
Bug:
78547904
Test: manual
Change-Id: I0afc18c94adf97154c61af2a5bdf933fb5f0e622
Merged-In: Iad5388a31a1502bc1944346276bb9600ac1386bd
Merged-In: I8bdd4a020e9d04f46847ef3c7e80ccf5c5cd19ea
Chalard Jean [Wed, 18 Apr 2018 11:18:38 +0000 (20:18 +0900)]
Make sure getActiveNetwork is consistent with default callbacks
Almost clean cherry-pick of ag/
3889538.
Bug:
77737389
Test: runtest framework-net
new test don't pass without the main code change, but they
do with it
Change-Id: I0cd83a935ab0b349aa47e065b830e5a43ab9a091
Merged-In: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
Merged-In: Ia8f985b448251f911484e6bd63fa562bffc1b0e4
Chalard Jean [Wed, 18 Apr 2018 10:18:58 +0000 (19:18 +0900)]
Add tests for getActiveNetwork.
Clean cherry-pick of ag/
3918295
One-line adjustment for ag/
3638326 which has not been put in AOSP.
Bug:
77737389
Test: runtest frameworks-net
Change-Id: I03ae2bbb08559f2cd44979e291c1f5d50eb215da
Merged-In: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
Merged-In: Ia8f985b448251f911484e6bd63fa562bffc1b0e4
Chalard Jean [Mon, 16 Apr 2018 03:25:22 +0000 (12:25 +0900)]
Guard the SSID with NETWORK_SETTINGS
Clean cherry-pick of ag/
3904260
Bug:
77865258
Test: manual
Change-Id: I2a2e236041797df495759dd4e07648545cad6c7c
Merged-In: Iba59e93875c28b8e30db0c013575bc2f117cb16c
Merged-In: I6cf364f0815a2eaab60f5de5e1d5ccc4908e9eca
Chalard Jean [Wed, 11 Apr 2018 12:09:10 +0000 (21:09 +0900)]
Add a new ssid field in NetworkCapabilities.
Clean cherry-pick of ag/
3887737
Bug:
77891227
Test: frameworks-net
Change-Id: Icefe1657bca52b913a72b56705342a7285769658
Merged-In: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda
Merged-In: I6dd1aba6fde5a502b4a9145cf16393d8ce623c89
Chalard Jean [Thu, 12 Apr 2018 02:52:37 +0000 (11:52 +0900)]
Notif manager and captive portal app to read SSID again
Cherry-picked from ag/
3887738 ; almost clean CP, only had
to add an import.
Bug:
77114259
Test: frameworks-net pass
manual test shows the SSID is now displayed again
Change-Id: I5cb2b4777ad78d972031e8f2ff22e2155f4ab894
Merged-In: I588fedba49ea5d08e40bd2b3ea8ba2c2383958ec
Merged-In: I663a59ff2847a9f44ea1395326f6cb00e97237b6
Pavel Maltsev [Mon, 9 Apr 2018 20:10:11 +0000 (13:10 -0700)]
Remove unwanted capability from the java-doc
Per API council feedback remove unwanted capaibility from public API
java docs
Clean cherry-pick from ag/
3868438
Bug:
77601789
Test: make docs
Test: build and flash
Change-Id: I4f3b8b558e8dab2bcc9ef4cc6cfc3135c264c291
Merged-In: I7fef43cce3cfe17dae6a5e4f564ad8857371502a
Merged-In: Ib02988daf44dabfaef7a0b788385b7f7c655b8b2
Pavel Maltsev [Mon, 2 Apr 2018 18:10:13 +0000 (11:10 -0700)]
Actually @hide unwanted capability methods.
Cherry-pick of ag/
3943779
Bug:
77601789
Test: builds, boots
Test: make doc-comment-check-docs
Merged-In: I80a88123b16c54734306da7e5dc0670972041648
Merged-In: I923e5377a1abe761217612452cbfdba752e53de2
Jeff Sharkey [Wed, 28 Mar 2018 20:01:55 +0000 (14:01 -0600)]
API council requested tweaks to NetworkRequest.
If you put values into the Builder, you should be able to observe
those values on the built object.
Clean cherry-pick of ag/
3813257
Test: atest android.net.cts.NetworkRequestTest
Bug:
74945408
Change-Id: Ib28de279efb8b33ab46aa64f580e10fe5f8720e3
Merged-In: I0d090ebb7d57689a061badcf593ae9a37d88f7ce
Merged-In: I539184f7385c1f288cfb77be8307e4463e07e9e6
Pavel Maltsev [Thu, 22 Mar 2018 18:41:32 +0000 (11:41 -0700)]
Add OEM_PAID capability to system api
Some system apps should be able to request OEM_PAID networks. This
makes a lot of sense when Android is used as in-vehicle infotainment
systems.
Clean cherry-pick of ag/
3782591
Bug:
68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I306f060c5a386ff4b82cd99a03dc037ce60ded6a
Merged-In: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa
Merged-In: I6e9c4130db23a4f1c89ce7e9071ae519a2b0b7ec
mswest46 [Mon, 12 Mar 2018 17:34:34 +0000 (10:34 -0700)]
add airplane mode shell commands to connectivity
Clean cherry-pick of ag/
3718273
Change-Id: I302802afc952b9df7a5544b12d9015091997bd67
Fixes:
74410990
Test: Manually checked that commands enable/disable airplane mode.
Merged-In: I8787d642594e6852bff5b902e8d0fa380ce7c37f
Adam Newman [Fri, 16 Mar 2018 17:36:35 +0000 (10:36 -0700)]
Enable cleartext for captive portal apps
When a user attempts to visit a captive portal the Activity will attempt
to load http://connectivitycheck.gstatic.com/generate_204 and a
walled-garden will typically intercept this and respond with a 302
redirect to a sign-in flow.
The new default of disabling cleartext unless explicitly enabled breaks
captive portal operation. This change enables cleartext for the two
applications that contain a CaptivePortalLoginActivity.
Clean cherry-pick of ag/
3750960
Bug:
75279991
Test: Manually associated with captive portals.
Exempt-From-Owner-Approval: Already approved by owner on pi-dev.
Change-Id: Ib9ea7a8a2aa72b8305fa7044df0e369a57d33953
Merged-In: Ie38d6ce6f54336db2f4672746dc7385e0a7979fb
Merged-In: I742bf6be74a9e6953d0a779bdab0c25cf32aa740
Treehugger Robot [Wed, 6 Jun 2018 04:36:53 +0000 (04:36 +0000)]
Merge "Add metalava based api-stubs modules in Android.bp"
Nan Zhang [Thu, 26 Apr 2018 00:23:33 +0000 (17:23 -0700)]
Add metalava based api-stubs modules in Android.bp
Test: m clean && m metalava-api-stubs-docs
Bug: b/
78245848
Change-Id: Ie0943d306af4176d965425ec85236cd173c1e870
Treehugger Robot [Tue, 5 Jun 2018 23:29:10 +0000 (23:29 +0000)]
Merge "Fix a 'memory leak'"
Ruchi Kandoi [Tue, 5 Jun 2018 20:56:35 +0000 (20:56 +0000)]
Merge "Suppress AID log on adb logcat"
Chad Brubaker [Thu, 8 Mar 2018 18:37:09 +0000 (10:37 -0800)]
Expose CONNECTIVITY_ACTION to Instant Apps
Clean cherry-pick of ag/
3710436
Test: Broadcast is visible to Instant Apps
Bug:
69421898
Change-Id: Ibac92b5aa16bf1538776b90df5dc05362667e785
Merged-In: I0434f8c7292a85e25df3da2858e4d89cf55fab3d
Merged-In: I62ed2107d0b0712267a903e465cbeba6a4f0b346
Eric Enslen [Thu, 8 Feb 2018 02:03:53 +0000 (18:03 -0800)]
fix isActiveNetworkMetered with VPNs
Clean cherry-pick of ag/
3580901
Bug:
72871435
Test: flashed and verified, also ran runtest framework-net
Merged-In: I177eff1237dd59514ccf91397a3d307148bc37b1
Change-Id: Ic5919a32f91f7baee5f1370703ad166e6ea52b58
Treehugger Robot [Tue, 5 Jun 2018 08:11:20 +0000 (08:11 +0000)]
Merge "Randomize the local Wifi IPv4 address"
Erik Kline [Tue, 29 May 2018 10:24:43 +0000 (19:24 +0900)]
Randomize the local Wifi IPv4 address
Also: address a few "error prone" warnings, adding @Override where missing
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes (with --no-hidden-api-checks)
- wifi tethering uses a randomized address, in as much as it can work
Bug:
32163131
Bug:
70673901
Change-Id: Icfabc48f2cf97b362ce292747f47021e84b900da
Treehugger Robot [Tue, 5 Jun 2018 04:35:55 +0000 (04:35 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN"
Treehugger Robot [Tue, 5 Jun 2018 01:15:16 +0000 (01:15 +0000)]
Merge "cts case com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in modue CtsIncidentHostTestCases failed"
Treehugger Robot [Mon, 4 Jun 2018 09:45:25 +0000 (09:45 +0000)]
Merge "Clear IPv4 address on tethering teardown."
Erik Kline [Fri, 18 May 2018 07:09:24 +0000 (16:09 +0900)]
Clear IPv4 address on tethering teardown.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- wlan0 in STA mode, wlan1 up/down in AP mode
no lingering IPv4 mode
- USB tethering up/down works
- bluetooth tethering yields:
05-18 17:50:49.726 719 756 D TetherController: untetherInterface(bt-pan)
05-18 17:50:49.729 1194 1230 E Tethering: [bt-pan] ERROR Failed to clear IPv4 address on interface bt-pan: java.lang.IllegalStateException: command '224 interface setcfg bt-pan 0.0.0.0 0' failed with '400 224 Failed to clear address (No such device)'
which is acceptable (no actual crash, just a log message)
Bug:
79905644
Merged-In: Ie898adc4efbb7376f0297abacdfe39c8700f0722
Merged-In: I9eb44eaf4e99fa85fff2909524ee88673bdcf1fd
Merged-In: Iaf29788a6692d810f3160e3f21d06b7452ecbaa6
(cherry picked from commit
472276a874316b725027098b79e1c9f03c62cad2)
Change-Id: Icb5c4f7971af4715c7662f80194b4c1ce369a135
Erik Kline [Mon, 4 Jun 2018 07:41:51 +0000 (07:41 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
Bernie Innocenti [Mon, 28 May 2018 13:04:37 +0000 (22:04 +0900)]
vpn: allow IPSec traffic through Always-on VPN
This won't leak any traffic outside the VPN as long as there are no
processes owned by uid 0 which generate network traffic (which is
currently the case).
Bug:
69873852
Test: compared the output of 'adb shell ip rule show' before and after
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/VpnTest.java
Test: local CTS tests run: android.net.cts.VpnServiceTest
Test: local CTS tests run: com.android.cts.devicepolicy.MixedDeviceOwnerTest
Change-Id: I8758e576c9d961d73f62bfcf0559dd7ecee6e8e6
Treehugger Robot [Mon, 4 Jun 2018 04:54:27 +0000 (04:54 +0000)]
Merge "com.android.media.tv.remoteprovider is built with java_sdk_library"
Sundong Ahn [Thu, 24 May 2018 08:18:12 +0000 (17:18 +0900)]
com.android.mediadrm.signer is built with java_sdk_library
The com.android.mediadrm.signer is built with java_sdk_library
and api files are added by running "make update-api".
The com.android.mediadrm.signer is removed in platform.xml
since it will be made auto generation by soong when the library is
built with java_sdk_library.
Bug:
77577799
Test: make -j
Test: make checkapi
Merged-In: I0e773615abe6aa8d757e489de2b9d807cd356146
Change-Id: I0e773615abe6aa8d757e489de2b9d807cd356146
(cherry picked from commit
2e1089bae43fe327346c531fcbdd4cc5d1664b14)
Treehugger Robot [Fri, 1 Jun 2018 17:21:27 +0000 (17:21 +0000)]
Merge "Fix comments to reflect changes in eth service"
Akinobu Nakashima [Fri, 1 Jun 2018 07:35:10 +0000 (16:35 +0900)]
Suppress AID log on adb logcat
When NFC event transaction intent is sent,
the device shows AID information on logcat.
But such information should not be shown for security reasons.
Test: Send NFC EventTransaction and check logcat
Bug:
80551185
Change-Id: I8d1f9c1946bb1514e3a6bfa70fff03be4525d6b5
Colin Cross [Thu, 31 May 2018 22:53:37 +0000 (22:53 +0000)]
Merge "Add support for --replace-version to aapt2"
Hall Liu [Thu, 31 May 2018 21:16:05 +0000 (21:16 +0000)]
Merge "Fix MbmsDownloadSession documentation"
Treehugger Robot [Thu, 31 May 2018 19:01:32 +0000 (19:01 +0000)]
Merge "DCB whitelist shortcode for user association"
Pavel Maltsev [Wed, 30 May 2018 19:31:21 +0000 (12:31 -0700)]
Fix comments to reflect changes in eth service
OEMs should be able to set gateway, DNS and domain for their static IP
configuration.
Cherry picked without conflicts.
Bug:
80090920
Test: m
Merged-in: Id7b6d538e2551cbd188821feb4b4feb102e4c751
(cherry picked from commit
d6b0780628bf4f758fd68534b4ecdf2da0fe2a7f)
Change-Id: I347a91e202fb6d6f1ae893c097c7d2e8856a3593
Hall Liu [Wed, 30 May 2018 23:11:11 +0000 (16:11 -0700)]
Fix MbmsDownloadSession documentation
Fix the TODO from forever ago and update the docs for the listener
registration methods.
Change-Id: I1276d0afe430e1b50c0af1fdfacb12a89ea5aa38
Fixes:
80493663
Test: None, comments only
Brad Ebinger [Thu, 31 May 2018 16:45:20 +0000 (16:45 +0000)]
Merge "IMS: Support for Implicit Call Rejection"
Remi NGUYEN VAN [Thu, 31 May 2018 02:23:17 +0000 (02:23 +0000)]
Merge "Add missing dependencies for libdexfile"
Omkar Kolangade [Mon, 2 Apr 2018 19:54:00 +0000 (12:54 -0700)]
IMS: Support for Implicit Call Rejection
Adding an API in MmTelFeature to allow IMS
Service to report the reasons for implicit
call rejections by lower layers. Corresponding
ImsReasonInfo codes are also being added.
The call rejections are not related to any
call session or a call that Framework is aware
of.
Change-Id: Ie47a239856db21e84d199a7620edf7b6ceeb81bc
Colin Cross [Sat, 26 May 2018 05:46:35 +0000 (22:46 -0700)]
Add support for --replace-version to aapt2
Implement --replace-version to match aapt1.
Bug:
79755007
Test: aapt2_tests
Change-Id: Iee2bd9a3981c7d4681509f18b735c6e9e6c1a336
Merged-In: Iee2bd9a3981c7d4681509f18b735c6e9e6c1a336
(cherry picked from commit
dcd58c420771af75c625242985bd96ba828aca56)
Hall Liu [Wed, 30 May 2018 20:24:34 +0000 (20:24 +0000)]
Merge "Add CallAudioState ctor as TestApi"
Treehugger Robot [Wed, 30 May 2018 19:54:42 +0000 (19:54 +0000)]
Merge "Check for bpf support at NetworkStatsService start"
Chenbo Feng [Sat, 19 May 2018 00:10:07 +0000 (17:10 -0700)]
Check for bpf support at NetworkStatsService start
The current implementation check for bpf map existance whenever a
NetworkStats request comes in. The check is not efficient and may
require additional permission for threads. So a member variable is added
to NetworkStatsService to store the bpf configuration status and is
initialized when NetworkStatsService start.
Test: -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
-m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug:
79994577
Change-Id: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Merged-In: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Yu Jia [Wed, 30 May 2018 03:18:05 +0000 (11:18 +0800)]
cts case
com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in
modue CtsIncidentHostTestCases failed
This cts case design 20 frames, every 4 frames include 700ms frame and
150ms frame
When activity launched, first 3 frames need allocate buffer during
dequeue buffer, bug some low-end platform took too long (>6ms), so
it will skip the fourth frame(150ms) and post a new draw callback that will cause cts failed
Colin Cross [Wed, 30 May 2018 05:01:08 +0000 (05:01 +0000)]
Merge "Use AAPT2 for more modules with manifest validation errors"
Remi NGUYEN VAN [Wed, 30 May 2018 04:52:08 +0000 (13:52 +0900)]
Add missing dependencies for libdexfile
Since a dependency was added to libartbase from libdexfile, this test
has been failing because of the missing deps. As discussed both
libartbase and its non-NDK dependencies need to be added.
Bug: b/
79785496
Bug: b/
80082746
Test: ApfTest and UidRangeTest now pass in master, still pass in aosp
Change-Id: Ia2c140514d7405d701c3ec520b77663abe2b34d5
Treehugger Robot [Wed, 30 May 2018 00:20:36 +0000 (00:20 +0000)]
Merge "Build java.obex with java_sdk_library"
Sundong Ahn [Fri, 18 May 2018 00:58:11 +0000 (09:58 +0900)]
Build java.obex with java_sdk_library
javax.obex is built with java_sdk_library and api files are added by
running "make update-api".
Remove java.obex is from platform.xml, since it will be generated
automatically by soong when the library is built with java_sdk_library.
Bug:
77577799
Test: make -j
make checkapi
Change-Id: Ib94955e62582ffbdfc7eb88cd0e494c61757c7aa
Tobias Thierer [Tue, 29 May 2018 12:11:58 +0000 (12:11 +0000)]
Merge "Track: Revert some needless differences vs upstream in Matcher.java"
Treehugger Robot [Tue, 29 May 2018 02:33:22 +0000 (02:33 +0000)]
Merge "apf: Increase test coverage of LDDW / STDW"
Treehugger Robot [Mon, 28 May 2018 17:00:50 +0000 (17:00 +0000)]
Merge "Do not setForceUse when a2dp config without change"
Jorim Jaggi [Mon, 28 May 2018 10:53:30 +0000 (10:53 +0000)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"
Erik Kline [Mon, 11 Dec 2017 05:24:08 +0000 (14:24 +0900)]
Send empty LinkProperties when entering StoppedState.
Additionally, no longer try to transition from within a State's
enter() method (this can encounter Log.wtf()s). Introduce some
CMD_JUMP_* commands and use deferMessage().
Test: as follows
- built, flashed, booted
- runtest -x IpClientTest passes
- basic DHCP wifi association works
Bug:
69800563
Bug:
70394432
Bug:
80284937
Change-Id: I7ed6e1a994a3556af345e8a4dfb51c383f6d5478
(cherry picked from commit
ffacb517d40df8ebb52d5906fa844b20c6520cd8)
Colin Cross [Fri, 18 May 2018 16:50:29 +0000 (09:50 -0700)]
Use AAPT2 for more modules with manifest validation errors
Add LOCAL_AAPT_FLAGS += --warn-manifest-validation to the modules
that have manifests that AAPT2 can't parse.
Bug:
79755007
Test: m checkbuild
Change-Id: I5f20ca582e481f7dac7b6a236662a2d1f47ea9fa
Tobias Thierer [Sat, 26 May 2018 15:20:20 +0000 (16:20 +0100)]
Track: Revert some needless differences vs upstream in Matcher.java
Android Matcher.start(int) declared "throws IllegalStateException",
which is correct but redundant. Upstream OpenJDK8u121-b13 does not
have this declaration. Another CL in this topic drops the declaration,
without changing behavior.
Bug:
35910877
Test: Treehugger
Change-Id: I59778f13f0df8bd4112af4edc25ee5a93084ae35
Hall Liu [Sat, 12 May 2018 00:14:08 +0000 (17:14 -0700)]
Add CallAudioState ctor as TestApi
Needed for CTS testing
Bug:
79528185
Test: CTS
Change-Id: Iad154257a93cc776d5800527e46e777fd6c88220
Merged-In: Iad154257a93cc776d5800527e46e777fd6c88220
Bryan Henry [Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)]
Merge "Allow changing signing cert for system apps that use shared users"
Treehugger Robot [Fri, 25 May 2018 16:42:59 +0000 (16:42 +0000)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"
Tetsutoki Shiozawa [Mon, 19 Feb 2018 01:24:43 +0000 (10:24 +0900)]
Fix: ConnectivityManager is initialized with a wrong context
ActivityThread#setHttpProxy uses a system context to get
a ConnectivityManager instance. If it's not already cached, the
system service registry will cache this instance initialized
with the system context, and subsequent calls to get this service
will return the bad instance.
This patch uses the application context instead, unless it's
not available for some unlikely reason.
A possible symptom of this issue is to have Bluetooth tethering
failing with a security exception, because it's requested by
the "android" package without system uid.
Merged-In: Ib8815f010883cdb94fcad2cdfb237de39327b20a
Bug:
73572062
Change-Id: Id652c1625194dc73dcbf8dfcad4b4e2e6fbebf4e
Treehugger Robot [Fri, 25 May 2018 10:04:43 +0000 (10:04 +0000)]
Merge changes from topic "location_provider"
* changes:
Remove FlpHardwareProvider
Create the stubs lib for com.android.location.provider
eddy-sh.chen [Fri, 25 May 2018 08:43:08 +0000 (16:43 +0800)]
Do not call finishKeyguardDrawn with PWM's mlock
Otherwise it may cause a deadlock between
PWM's mlock and WMS's mWindowMap.
Just post the work to the policy handler instead.
Bug:
80279029
Change-Id: Idae333687cf5c88e1893ee216c278b9e6c17dd98
Treehugger Robot [Fri, 25 May 2018 08:26:34 +0000 (08:26 +0000)]
Merge "Add permission check to setAllowOnlyVpnForUids"
Jiyong Park [Thu, 8 Mar 2018 07:43:07 +0000 (16:43 +0900)]
Remove FlpHardwareProvider
After Treble's FLP merge into GNSS HAL, the FlpHardwareProvider is just
an empty shell. Removing FusedLocation and/or Flp + Hardware classes
altogether.
Bug:
35726697
Test: m -j
Test: Open Google Map and then walk around. The dot moves as I walk.
Merged-In: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
Change-Id: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
(cherry picked from commit
4cc3a1c056f69ac4da1dc5055c36b7357e9f673c)
Jiyong Park [Tue, 27 Feb 2018 13:00:23 +0000 (22:00 +0900)]
Create the stubs lib for com.android.location.provider
com.android.location.provider.stubs is the stubs library for the shared
library com.android.location.provider. The stubs library is intended to
provide the stable set of APIs to the apps implementing location
provider.
Without the stubs library, apps had to directly link to the shared
library which is built without Android SDK and exposes private APIs that
are not intended to be used by apps. This also has been causing the
lin-type check warnings when the shared lib is used by apps built with
SDK; apps built with SDK is not allowed to link to lib built without
SDK. This has been reported as warnings but will soon be errors. Now
such apps are required to link to the stubs lib, which is built with
SDK.
While building the stubs library, following APIs are made hidden because
they are exposing private APIs from the Android platform.
1) Activity* classes are removed from the API, as they are not intended
to be used by apps since O.
2) GeocodeProvider and GeofenceProvider are removed from the API.
3) LocationProvider.mLocationManager is removed as it is exposing the
private symbol ILocationProvider
4) ProviderPropertiesUnbundle.getProviderProperties are removed from the
API as it is exposing the private symbol ProviderProperties.
5) The constructor of ProviderRequestUnbundled is removed since the
class is intended to be instantiated by the service.
Bug:
71420593
Test: m -j com.android.location.provider.stubs
Merged-In: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
Change-Id: I20aba7e9ca9c3adc75db241f37a55f0d657f3ced
(cherry picked from commit
eee99986c8021d6825f99a25434725fccf7b2b12)
Remi NGUYEN VAN [Fri, 25 May 2018 03:28:05 +0000 (03:28 +0000)]
Merge "Use AI_ADDRCONFIG for most DNS requests"
Remi NGUYEN VAN [Fri, 25 May 2018 03:27:39 +0000 (03:27 +0000)]
Merge "Migrating remaining core networking tests to Junit4"
zengjing [Fri, 25 May 2018 03:15:20 +0000 (11:15 +0800)]
Do not setForceUse when a2dp config without change
When device connected with wired headset and without any bluetooth
connection, APP may call MediaRouter to setForceUse to set FOR_MEDIA
with FORCE_SPEAKER, then sound be output to SPEAKER. In this case,
if setBluetoothA2dpOn(false) was called, FOR_MEDIA will be set with
FORCE_NONE and sound be output to wird headset.
The issue discussed above occurred on our device. We developed an FM radio APP.
Beforce work, wired headset must be plugged in to be used as antennas. Then we
setForceUse FOR_MEDIA to FORCE_SPEAKER, and audio stream was output to speaker.
At this moment, if we play other sound (such as ScreenCapture sound),
MediaRouterService will detected audio playbacked state changed. Because FM Audio
was not monitor by AudioPlaybackMonitor, there was not any audio playback active.
So, restoreBluetoothA2dp was called in the function of onAudioPlayerActiveStateChanged,
which call AudioService.setBluetoothA2dpOn(false). As a result sound was switch to headset.
There are two solutions to fix our issue.
1) Check a2dp state before setBluetoothA2dpOn in MediaRouterService::restoreBluetoothA2dp,
if a2dp state does not change, setBluetoothA2dpOn should not be called
2) Check a2dp state before setForceUse in AudioService::setBluetoothA2dpOn,
if a2dp state does not change, setForceUse should not be called
Consdering that setBluetoothA2dpOn may be called by other method, we try to fix it
with the second one.
Test: NA
Change-Id: I3a2e64e7d73d9aa9539176fea556feb433cb7211
Signed-off-by: zengjing <zengjing@xiaomi.com>
Treehugger Robot [Thu, 24 May 2018 19:13:19 +0000 (19:13 +0000)]
Merge "Work around b/
24465209, do not pack relocation table."
Treehugger Robot [Thu, 24 May 2018 18:28:59 +0000 (18:28 +0000)]
Merge "Framework: Add API to get zygote PID"
Tyler Gunn [Thu, 24 May 2018 17:44:44 +0000 (10:44 -0700)]
Ensure self-managed calls use voip audio mode.
Although Telecom ensures that new calls use voip audio mode, the default
value from a Connection would override the Telecom default.
Bug:
76362663
Test: Modify test app to ensure it does not set voip audio mode, ensure
Telecom uses voip audio mode for new calls.
Change-Id: Ie6477659cf6dabd08f371d4958ece1d258cd3106
Treehugger Robot [Thu, 24 May 2018 16:55:49 +0000 (16:55 +0000)]
Merge "Use correct filename when adding to ringtone"
Chih-Hung Hsieh [Wed, 23 May 2018 04:37:08 +0000 (21:37 -0700)]
Work around b/
24465209, do not pack relocation table.
Global flag --pack-dyn-relocs=android is used with clang lld.
For b/
24465209, we need to override that with pack_relocations:false.
Bug:
24465209
Bug:
80093890
Test: build with USE_CLANG_LLD=true and run dlext.compat_elf_hash_and_relocation_tables
Change-Id: I9364feb4070d4f75705d8651d535c792fe6ad6f7
Treehugger Robot [Thu, 24 May 2018 10:14:08 +0000 (10:14 +0000)]
Merge changes Id81271ff,I8f298371
* changes:
DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
DO NOT MERGE ANYWHERE Sort hiddenapi-p-light-greylist.txt
David Brazdil [Wed, 23 May 2018 14:58:36 +0000 (15:58 +0100)]
DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: Id81271ffe2080091d4e4c3d40325183b086dba8e
David Brazdil [Wed, 23 May 2018 14:54:31 +0000 (15:54 +0100)]
DO NOT MERGE ANYWHERE Sort hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I8f298371df3efbc3d968c95337e058d6140fe5de
Remi NGUYEN VAN [Thu, 24 May 2018 07:53:00 +0000 (07:53 +0000)]
Merge changes I3b3bcbbd,I18b3f263,I3c416c1a
* changes:
Use CaptivePortalProbeSpec method in portal app
Add configurable captive portal probes
Move CaptivePortalProbeResult to its own file
Hugo Benichi [Thu, 12 Oct 2017 04:04:54 +0000 (13:04 +0900)]
Migrating remaining core networking tests to Junit4
Bug:
62918393
Test: runtest frameworks-net
Merged-In: I30f7eaa0307b8fad5a8de7a0da235a4f76c18677
(clean cherry-pick of I30f7eaa0307b8fad5a8de7a0da235a4f76c18677)
Change-Id: I272fea0bb4a9e7f6252bb3bd14a6b769a082039e
Sundong Ahn [Thu, 24 May 2018 07:17:03 +0000 (16:17 +0900)]
com.android.media.tv.remoteprovider is built with java_sdk_library
The com.android.media.tv.remoteprovider is built with java_sdk_library
and api files are added by running "make update-api".
The com.android.media.tv.remoteprovider is removed in platform.xml
since it will be made auto generation by soong when the library is
built with java_sdk_library.
Bug:
77577799
Test: make -j
make checkapi
Change-Id: If0f33bbdde42d891471cd7d3d295d433a88affec
Treehugger Robot [Thu, 24 May 2018 07:07:15 +0000 (07:07 +0000)]
Merge "Fixup SntpClient to bypass Private DNS"
Erik Kline [Tue, 22 May 2018 12:15:49 +0000 (21:15 +0900)]
Fixup SntpClient to bypass Private DNS
NTP may be necessary in order to validate Private DNS certificates,
so it should be allowed to bypass Private DNS.
Test: as follows
- built, flashed, booted
- tcpdump for port 53; adb shell am restart
queries for the NTP hostname appear in the clear
- runtest frameworks-net passes
Bug:
64133961
Bug:
80118648
Merged-In: I4655e3ce5691098c73bf070b8a9e4759485bb17a
Merged-In: I327b816a9f472e94328232157a3b8887d17b0baf
Change-Id: Id9ceb3fcaaffb48cbbd4cd381d48cae991572c9e
(cherry picked from commit
7eccfeb9ca60aa6e09afbdf3a4435cb2f0d12987)
Remi NGUYEN VAN [Tue, 22 May 2018 08:04:17 +0000 (17:04 +0900)]
Use CaptivePortalProbeSpec method in portal app
This only changes behavior if the EXTRA_CAPTIVE_PORTAL_PROBE_SPEC extra
is passed, which only happens if extra probe specs have been defined in
settings.
Bug: b/
79499239
Test: manual: on 2 different portals, works w/ and w/o the setting
Merged-In: Iebd307b5d73a7b4679baea2a1c12c3baba6a7447
Merged-In: I851d8c41d42dccb03f813e549439f44c83f7d5ac
(clean cherry-pick of pi-dev I70acfd9213bf620cbb79ad999b8ad03472e8d43f)
Change-Id: I3b3bcbbd380f8cbd0b663556d55276f43e30b3e5
Remi NGUYEN VAN [Tue, 22 May 2018 01:01:53 +0000 (10:01 +0900)]
Add configurable captive portal probes
The probes allow testing for a configurable status code and location
header (regexes). They are disabled by default, so this CL is a
no-op unless the probe configurations are pushed.
Bug: b/
79499239
Test: tests in CL pass, manual: captive portal login works
Merged-In: Iec7a74bbf2569a91e958c497200d77e8451cbf7b
Merged-In: Ia958815325d1466345e9626efc8f62fc9d08d774
(clean cherry-pick of pi-dev I785723aaed06054b9aa8ebff77803f23d7836db9)
Change-Id: I18b3f263fed08fa4fee20d5e88f3ec8647d7f835
Remi NGUYEN VAN [Tue, 22 May 2018 00:58:19 +0000 (09:58 +0900)]
Move CaptivePortalProbeResult to its own file
This is necessary to resolve visibility issues for the next change.
Bug: b/
79499239
Test: runtest frameworks-net
Merged-In: Ia48b32307a51a66f2672d7112f71166dd6db41b1
Merged-In: I5df7ee9f16bc6be4f02353d40a843a383dd4cbd9
(Clean cherry-pick of pi-dev I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299)
Change-Id: I3c416c1a91ebfdf914fd528ff8ab73e3eb490562
Remi NGUYEN VAN [Tue, 22 May 2018 09:20:51 +0000 (18:20 +0900)]
Use AI_ADDRCONFIG for most DNS requests
Not using it doubles the number of DNS lookups for single-stack
networks.
Private DNS hostname resolution still does not use this flag so that we
get all address families in advance, in case of LinkProperties changes.
Bug: b/
79811321
Test: manual: Captive portal, 464xlat, networking in apps working
Merged-In: I7037342a93dc48b8e0988e719b9a9a2d5055bcf2
Merged-In: I8ca15fa079cd5ff94e4d9f7e0476504769f9708f
(Clean cherry-pick of pi-dev Ib46756e5e5f8d8d2698c90c5183c368d2d44be7a)
Change-Id: Iedb7a9c5f9caeb66de4505189fca8db91013d844
Daisuke Teranishi [Fri, 18 May 2018 00:43:54 +0000 (09:43 +0900)]
Use correct filename when adding to ringtone
If the title of the music file includes "/", it's recognized
as a directory separator.
Use correct filename to select the file properly.
Bug:
80202253
Test: Add mp3 which title includes "/" to ringtone
Change-Id: I9bb05f6fe2d7d4dbbdf4f67db7ac6fde04707979
David Brazdil [Wed, 23 May 2018 16:36:47 +0000 (16:36 +0000)]
Merge "Update hidden API lists in AOSP"
Pete Gillin [Wed, 23 May 2018 15:55:48 +0000 (15:55 +0000)]
Merge "Remove Arrays.checkOffsetAndCount from the greylist."
David Brazdil [Wed, 23 May 2018 14:51:19 +0000 (15:51 +0100)]
Update hidden API lists in AOSP
This should only be merged into AOSP branches
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Test: N/A
Change-Id: Ia9b362cf44821273a8c4d25f73ffd881895e7df1