OSDN Git Service
Chalard Jean [Fri, 8 Jun 2018 13:01:27 +0000 (06:01 -0700)]
Merge "Opportunistic typo fix"
am:
6b03498a54
Change-Id: Id6dc12172a9fb1980a598ba070af1b10b1738849
Treehugger Robot [Fri, 8 Jun 2018 11:51:29 +0000 (11:51 +0000)]
Merge "Opportunistic typo fix"
Eric Laurent [Fri, 8 Jun 2018 03:10:14 +0000 (20:10 -0700)]
Merge "Add field to set A2DP device volume on connect (1/2)"
am:
1b9de57f38
Change-Id: I128bf69bfdd9efaaf186ed3b9278d7ef1479b19e
Mathieu Chartier [Fri, 8 Jun 2018 02:32:39 +0000 (19:32 -0700)]
Merge "Add filter for NoPreloadHolders"
am:
88ee5c93bb
Change-Id: I4e6b539a4fabf1584673100e48146f22a929f3b3
Treehugger Robot [Fri, 8 Jun 2018 02:06:17 +0000 (02:06 +0000)]
Merge "Add field to set A2DP device volume on connect (1/2)"
Mathieu Chartier [Thu, 7 Jun 2018 23:27:12 +0000 (23:27 +0000)]
Merge "Add filter for NoPreloadHolders"
Eric Laurent [Mon, 21 May 2018 16:28:46 +0000 (09:28 -0700)]
Add field to set A2DP device volume on connect (1/2)
Add a field to setBluetoothA2dpDeviceConnectionStateInt() to allow
Bluetooth to set a volume for the new device when it connects.
Bug:
79529581
Test: Switch repeatedly between devices and see that the old volume isn't
used on the new device or the new volume isn't used on the old device.
Change-Id: Iea13ca8b5c538c999149baba6e9069745ad9466b
Merged-In: I909fa3f40818c595fc977695fbfa1214f9a4de72
(cherry picked from commit
3e6fb6309033c50081c0789b5905d5cd539b38f6)
Mathieu Chartier [Thu, 7 Jun 2018 21:30:24 +0000 (14:30 -0700)]
Add filter for NoPreloadHolders
Avoid including these in the preloaded classes.
Test: manual
Bug:
109652611
Change-Id: I1efd1749e54e8b38ca8f7e3ff05058ddb0fe4460
Brad Ebinger [Thu, 7 Jun 2018 18:57:18 +0000 (11:57 -0700)]
Merge "Add GTS test APIs for testing ImsService"
am:
5a6df1afa7
Change-Id: Ie7b3eca14fce98be4f78fc95aac4795d7ea730fc
Brad Ebinger [Thu, 7 Jun 2018 17:03:28 +0000 (17:03 +0000)]
Merge "Add GTS test APIs for testing ImsService"
Neil Fuller [Thu, 7 Jun 2018 16:52:48 +0000 (09:52 -0700)]
Merge "Remove CommonClock / CommonTimeManagementService"
am:
72072cd769
Change-Id: I3146a6da8f3fbecc19b344b077e43b5d3e734041
Neil Fuller [Thu, 7 Jun 2018 15:50:06 +0000 (15:50 +0000)]
Merge "Remove CommonClock / CommonTimeManagementService"
Sundong Ahn [Thu, 7 Jun 2018 12:43:38 +0000 (05:43 -0700)]
Merge "com.android.mediadrm.signer is built with java_sdk_library"
am:
c55e1b6f4d
Change-Id: I33dec56812e9207a3b60efbb8001c93bb67c5349
Treehugger Robot [Thu, 7 Jun 2018 11:27:25 +0000 (11:27 +0000)]
Merge "com.android.mediadrm.signer is built with java_sdk_library"
Chalard Jean [Thu, 7 Jun 2018 05:48:23 +0000 (14:48 +0900)]
Opportunistic typo fix
Test: unneeded
Change-Id: I2f5636f3d7ea4b6e9d3e6feddfd0cb586d658813
Tyler Gunn [Wed, 6 Jun 2018 23:03:46 +0000 (16:03 -0700)]
Merge "Ensure self-managed calls use voip audio mode."
am:
b62aa315d1
Change-Id: I262357c1aa9a23270edc2f1b1df409840fbf626d
Brad Ebinger [Tue, 3 Apr 2018 22:16:38 +0000 (15:16 -0700)]
Add GTS test APIs for testing ImsService
Bug:
77141737
Test: Manual
Merged-In: Id60cf07121cf98ab3f0a10af10cf70beb25feb54
Change-Id: Ia41a96b5013bc6a7f534c347db72a14348c1fc5d
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 10:00:49 +0000 (03:00 -0700)]
Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ...
am:
b044b885cf
Change-Id: Ib54b132dae9e6ab4e01ee46a8afdcb2f50df2709
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
Nan Zhang [Wed, 6 Jun 2018 05:49:06 +0000 (22:49 -0700)]
Merge "Add metalava based api-stubs modules in Android.bp"
am:
f907578564
Change-Id: Id02938835849e346edb409bc77b1cb3d887ab0ff
Treehugger Robot [Wed, 6 Jun 2018 04:36:53 +0000 (04:36 +0000)]
Merge "Add metalava based api-stubs modules in Android.bp"
George Burgess IV [Wed, 6 Jun 2018 02:17:16 +0000 (19:17 -0700)]
Merge "Fix a 'memory leak'"
am:
38e7338d92
Change-Id: Ie6670cd3f6fe1405859d75d2454ec6894f5c5913
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 23:14:32 +0000 (16:14 -0700)]
Merge "Suppress AID log on adb logcat"
am:
e72aecb655
Change-Id: Ib2acf51fbaf4d1c23d0629a0b8538f3fdb6d313a
Ruchi Kandoi [Tue, 5 Jun 2018 20:56:35 +0000 (20:56 +0000)]
Merge "Suppress AID log on adb logcat"
Erik Kline [Tue, 5 Jun 2018 10:08:53 +0000 (03:08 -0700)]
Merge "Randomize the local Wifi IPv4 address"
am:
13cb6084e2
Change-Id: I2aa4170c8f0b277d6c6e3489012c3698ab3d3229
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
Bernie Innocenti [Tue, 5 Jun 2018 05:53:58 +0000 (22:53 -0700)]
Merge "vpn: allow IPSec traffic through Always-on VPN"
am:
4d3b5c1d3b
Change-Id: I90fbe3ad3ec8b9d3b52e6036ae07dd8db814cb22
Treehugger Robot [Tue, 5 Jun 2018 04:35:55 +0000 (04:35 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN"
Yu Jia [Tue, 5 Jun 2018 02:34:00 +0000 (19:34 -0700)]
Merge "cts case com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in modue CtsIncidentHostTestCases failed"
am:
2dd3d8cbef
Change-Id: I37d35302041a8759eae91e616fa6f3d5c7fdf401
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"
Erik Kline [Mon, 4 Jun 2018 17:36:28 +0000 (10:36 -0700)]
Merge "Clear IPv4 address on tethering teardown."
am:
86e94acfa4
Change-Id: Ibea385035880e971445b10d814d04c7419d3aaff
Erik Kline [Mon, 4 Jun 2018 17:26:40 +0000 (10:26 -0700)]
Merge "Send empty LinkProperties when entering StoppedState."
am:
59ccf1041f
Change-Id: I0405006d15bc5d05d09202fa9dbc81989a9c0717
Sundong Ahn [Mon, 4 Jun 2018 17:14:24 +0000 (10:14 -0700)]
Merge "com.android.media.tv.remoteprovider is built with java_sdk_library"
am:
bd83ac0ecc
Change-Id: I5f786115b1a81a6505e473dc51e82b6b14037d22
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)
Pavel Maltsev [Fri, 1 Jun 2018 18:28:04 +0000 (11:28 -0700)]
Merge "Fix comments to reflect changes in eth service"
am:
1f392c468a
Change-Id: I542f43603ef19387c57b74cdadf0900548256c39
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 [Fri, 1 Jun 2018 00:38:48 +0000 (17:38 -0700)]
Merge "Add support for --replace-version to aapt2"
am:
186be90eb6
Change-Id: I6397623d883af229a8941bd26a084d09d40f48c9
Hall Liu [Fri, 1 Jun 2018 00:33:55 +0000 (17:33 -0700)]
Merge "Fix MbmsDownloadSession documentation"
am:
bb2ce1010e
Change-Id: Ibe39e6526e7cc89dc95eac90fcb0a431938ca307
Eeshan Shrimali [Fri, 1 Jun 2018 00:23:12 +0000 (17:23 -0700)]
Merge "DCB whitelist shortcode for user association"
am:
b17d1962b7
Change-Id: I802a1ecd1ff23e15860ed03e22491476aec2d3ed
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"
Brad Ebinger [Thu, 31 May 2018 19:10:05 +0000 (12:10 -0700)]
Merge "IMS: Support for Implicit Call Rejection"
am:
19d032b695
Change-Id: Ic0238e05ea2682ded8420f739834df94db7c7222
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
Remi NGUYEN VAN [Thu, 31 May 2018 17:27:22 +0000 (10:27 -0700)]
Merge "Add missing dependencies for libdexfile"
am:
286aa939af
Change-Id: Icde98a98d4d2dbeeab8ea058dd5168c510494eaf
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 22:09:21 +0000 (15:09 -0700)]
Merge "Add CallAudioState ctor as TestApi"
am:
39ac9ffe27
Change-Id: I7ecc3c81927b58bddb5ae12f254be0c09133672a
Chenbo Feng [Wed, 30 May 2018 22:05:08 +0000 (15:05 -0700)]
Merge "Check for bpf support at NetworkStatsService start"
am:
0defa6e72c
Change-Id: Ia2b5c8c7b7185787fee57281727b366752ef887f
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
Colin Cross [Wed, 30 May 2018 06:21:55 +0000 (23:21 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors"
am:
ce1979d707
Change-Id: If52a42d9f2a95d5d957b177e36a7a14fd54bace9
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
Sundong Ahn [Wed, 30 May 2018 01:38:07 +0000 (18:38 -0700)]
Merge "Build java.obex with java_sdk_library"
am:
ad769993a9
Change-Id: I3a895f10880efb9ae916376f62d059941a25e417
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 13:38:18 +0000 (06:38 -0700)]
Merge "Track: Revert some needless differences vs upstream in Matcher.java"
am:
adb8532394
Change-Id: Iec1fc62d8e3fbc55f4a835bf664c908c9ec30b59
Tobias Thierer [Tue, 29 May 2018 12:11:58 +0000 (12:11 +0000)]
Merge "Track: Revert some needless differences vs upstream in Matcher.java"
Bernie Innocenti [Tue, 29 May 2018 03:35:33 +0000 (20:35 -0700)]
Merge "apf: Increase test coverage of LDDW / STDW"
am:
e03b8ee7e0
Change-Id: Ibc1a443c1c3a34edde835361e538a8d9cb8addb9
Treehugger Robot [Tue, 29 May 2018 02:33:22 +0000 (02:33 +0000)]
Merge "apf: Increase test coverage of LDDW / STDW"
zengjing [Mon, 28 May 2018 18:00:16 +0000 (11:00 -0700)]
Merge "Do not setForceUse when a2dp config without change"
am:
8a984b9f08
Change-Id: I644087265717458cb2ffa6bb20d29d90690c0022
Treehugger Robot [Mon, 28 May 2018 17:00:50 +0000 (17:00 +0000)]
Merge "Do not setForceUse when a2dp config without change"