Commit Graph

6547 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
9213759d2a Merge "Merge "Fix comment on StaticIpConfiguration#getDomains" am: a430dae4b7 am: a87e7d5a41" into qt-dev-plus-aosp
am: d084c945d1

Change-Id: I4f490fa9190c38657f146326cf1133c1333d0ca2
2019-04-10 03:02:00 -07:00
Chenbo Feng
55bcf5abd7 Merge "Add smoke test for jni library" am: d38640b7d5 am: 46a3c2c655
am: ec134363c0

Change-Id: I1078ad41f5c04d6d2e07879dfae19c31534b763b
2019-04-10 02:42:26 -07:00
Remi NGUYEN VAN
c24d2af084 Merge "Fix comment on StaticIpConfiguration#getDomains" am: a430dae4b7
am: a87e7d5a41

Change-Id: I6a2ff0368193aaa988585613d99662a01cf4fa26
2019-04-10 00:07:05 -07:00
Chenbo Feng
ec134363c0 Merge "Add smoke test for jni library" am: d38640b7d5
am: 46a3c2c655

Change-Id: Iba607c906917017f79f141f4e0599a2330cc0f14
2019-04-10 00:01:28 -07:00
Remi NGUYEN VAN
a87e7d5a41 Merge "Fix comment on StaticIpConfiguration#getDomains"
am: a430dae4b7

Change-Id: Ia664b08eabe344470a5c08e5510f1a8f7132ac73
2019-04-09 23:54:09 -07:00
Chenbo Feng
46a3c2c655 Merge "Add smoke test for jni library"
am: d38640b7d5

Change-Id: Iedb44739539f63090b067c1a25d4e83c333caddb
2019-04-09 23:50:10 -07:00
Treehugger Robot
a430dae4b7 Merge "Fix comment on StaticIpConfiguration#getDomains" 2019-04-10 06:30:55 +00:00
Treehugger Robot
d38640b7d5 Merge "Add smoke test for jni library" 2019-04-10 06:30:26 +00:00
Chenbo Feng
dc2d592e68 Add smoke test for jni library
Since the Framework net test require jni library
libnetworkstatsfactorytestjni, but the test fails to load that library
unless *all* the dependencies of that library are explicitly listed in
jni_libs, whenever any of the dependencies changes the framework net
test will start failing and it might not be catched since the change
might not related to frameworks/base. And this smoke test is aimed to
spot those native library changes and it should be stable enough to put
in global presubmit.

Bug: 124764595
Test: FrameworksNetSmokeTests
Change-Id: Id24e7f0558b5643e4ad7393e85f1f0a2bd875615
2019-04-09 14:45:35 -07:00
Benedict Wong
a7bfdf8d8b Merge "Fix remove-before-add for IpSecService RefcountedResource" am: 3a9e68d173 am: dccdcedd6a
am: a7725f9fab

Change-Id: Ib955acaa5e498c0e977cb5f2e48cffbc9fea8c7c
2019-04-09 11:31:46 -07:00
Benedict Wong
a7725f9fab Merge "Fix remove-before-add for IpSecService RefcountedResource" am: 3a9e68d173
am: dccdcedd6a

Change-Id: I416c2e43961ec0e1cc6b2fbcef970fbce858603b
2019-04-09 10:56:30 -07:00
Benedict Wong
dccdcedd6a Merge "Fix remove-before-add for IpSecService RefcountedResource"
am: 3a9e68d173

Change-Id: Ief286a54a93efd731deeff9fc32815663ab7695d
2019-04-09 10:39:16 -07:00
Benedict Wong
3a9e68d173 Merge "Fix remove-before-add for IpSecService RefcountedResource" 2019-04-09 17:22:56 +00:00
Chalard Jean
1ca964961b [automerger skipped] Merge "Address leftover comments on aosp/894233" into qt-dev am: 35d521ed42 -s ours
am: bebad31f86 -s ours
am skip reason: change_id Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 with SHA1 061f7a7eef is in history

Change-Id: I9004b0471c951fe7c64b2f384c3666f40b3360e9
2019-04-09 09:16:10 -07:00
Junyu Lai
6d3a92f7c2 Merge "Fix onBlockedStatusChanged does not work on multiple networks" am: 4cc967d1ba am: 4e628af901
am: 0da5aa04bf

Change-Id: I11168fd07a7c29e0605f2e874e9d9f41b5ad88b6
2019-04-09 08:59:00 -07:00
Chalard Jean
bebad31f86 [automerger skipped] Merge "Address leftover comments on aosp/894233" into qt-dev
am: 35d521ed42 -s ours
am skip reason: change_id Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 with SHA1 061f7a7eef is in history

Change-Id: I6e9043be4c28b73856b72f80971e2b66f8b8926b
2019-04-09 06:54:57 -07:00
Junyu Lai
0da5aa04bf Merge "Fix onBlockedStatusChanged does not work on multiple networks" am: 4cc967d1ba
am: 4e628af901

Change-Id: I4e414fd34b463219e6374de15622918af7d7fa49
2019-04-09 06:50:52 -07:00
TreeHugger Robot
35d521ed42 Merge "Address leftover comments on aosp/894233" into qt-dev 2019-04-09 13:39:29 +00:00
Junyu Lai
4e628af901 Merge "Fix onBlockedStatusChanged does not work on multiple networks"
am: 4cc967d1ba

Change-Id: Ia8edf1e9d0f49da5be2bac1889cd0001010a869b
2019-04-09 05:43:18 -07:00
Chalard Jean
a2f3c1bf21 Address leftover comments on aosp/894233
Cherry-pick from commit 061f7a7eef,
with small conflict resolution.

Bug: 129510344
Test: m, boots, wifi connects, resolves DNS
Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
Merged-In: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
Merged-In: Ia08104f839ef37139a8761e2e625bb10c94c275f
2019-04-09 12:16:52 +00:00
Junyu Lai
4cc967d1ba Merge "Fix onBlockedStatusChanged does not work on multiple networks" 2019-04-09 12:13:26 +00:00
Lorenzo Colitti
45ed54de34 [automerger skipped] Merge "Fix ConnectivityServiceTest fail." into qt-dev am: 0bf3e765f8 -s ours
am: cc53471dcd -s ours
am skip reason: change_id I7f185e731db91c30a9b0f14aefbdbb067942190e with SHA1 716a9412cd is in history

Change-Id: I8ae903ed61dd37a37b36e2f878e4f90977e9c1bd
2019-04-09 04:55:57 -07:00
Lorenzo Colitti
01eafc6eb8 [automerger skipped] Merge "Fix flaky UdpEncapsulationSocket test" into qt-dev am: d74809c670 -s ours
am: 57269c078d -s ours
am skip reason: change_id Idf040a67e53d9b9ec6e6c647ce24f8ada501d355 with SHA1 a06b814245 is in history

Change-Id: Ic488c621c0ebe04c6298d7d2a06201abcbb61a37
2019-04-09 04:33:08 -07:00
Lorenzo Colitti
bae9cf2f82 [automerger skipped] Merge "Extend support for requestRouteToHostAddress for backward compatibility" into qt-dev am: 8d994400b5 -s ours
am: cff261da05 -s ours
am skip reason: change_id Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d with SHA1 4360e7f31c is in history

Change-Id: If24f59d5cd8b1b92ed1bf84589a0dfede9b247db
2019-04-09 04:27:25 -07:00
Lorenzo Colitti
cc53471dcd [automerger skipped] Merge "Fix ConnectivityServiceTest fail." into qt-dev
am: 0bf3e765f8 -s ours
am skip reason: change_id I7f185e731db91c30a9b0f14aefbdbb067942190e with SHA1 716a9412cd is in history

Change-Id: I6eddfc7bae967c76c63521b7fbcabd78a913bfd4
2019-04-09 03:44:42 -07:00
Lorenzo Colitti
0bf3e765f8 Merge "Fix ConnectivityServiceTest fail." into qt-dev 2019-04-09 10:25:10 +00:00
Chalard Jean
5064c37fb2 Merge "Merge "Address leftover comments on aosp/894233" am: fee09e64d5 am: d084f2ddd8" into qt-dev-plus-aosp
am: b4257cbaf3

Change-Id: I51ffa1193ca495c496319dea2a182cea61e44408
2019-04-09 03:08:14 -07:00
Remi NGUYEN VAN
ce2f10f7cd Merge "Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev am: 9b27e1f8b8" into qt-dev-plus-aosp
am: 236b3786e5

Change-Id: I3d7855839bf19b4481295d8cd1c7f55a192f936d
2019-04-09 02:32:45 -07:00
Lorenzo Colitti
57269c078d [automerger skipped] Merge "Fix flaky UdpEncapsulationSocket test" into qt-dev
am: d74809c670 -s ours
am skip reason: change_id Idf040a67e53d9b9ec6e6c647ce24f8ada501d355 with SHA1 a06b814245 is in history

Change-Id: Ic9b6b8c2ca4aabd3ed18291a94992a2b67286064
2019-04-09 02:31:35 -07:00
TreeHugger Robot
d74809c670 Merge "Fix flaky UdpEncapsulationSocket test" into qt-dev 2019-04-09 09:15:02 +00:00
Lorenzo Colitti
cff261da05 [automerger skipped] Merge "Extend support for requestRouteToHostAddress for backward compatibility" into qt-dev
am: 8d994400b5 -s ours
am skip reason: change_id Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d with SHA1 4360e7f31c is in history

Change-Id: I7cd14e336c2ab60e92c247e42d9acddf08316edf
2019-04-09 02:13:26 -07:00
Remi NGUYEN VAN
e3896f71e1 Merge "Expose captive portal urls for configuration" am: 07a100484f am: 1245ea1fe5
am: 9b84ea14a8

Change-Id: I1f734c5f864bb2f2bc8ba1a66fe33d3480554f69
2019-04-09 02:04:54 -07:00
paulhu
284eff450c Fix ConnectivityServiceTest fail.
NetdService#getInstance() will get null object in
WrappedConnectivityService constructor. Then pass this null
INetd object to PermissionMonitor will case NPE in
PermissionMonitor#sendPackagePermissionsToNetd()

Bug: 128024100
Test: atest FrameworksNetTests
Change-Id: Ia1c80f9600a19c4aaf3f3c1b497b355d96c49c8e
Merged-In: I7f185e731db91c30a9b0f14aefbdbb067942190e
Merged-In: Ic77ef73841266da487401ffd657ef63562b6fc1e
(cherry picked from commit 716a9412cd)
2019-04-09 08:57:08 +00:00
Android Build Merger (Role)
b4257cbaf3 Merge "Merge "Address leftover comments on aosp/894233" am: fee09e64d5 am: d084f2ddd8" into qt-dev-plus-aosp 2019-04-09 06:53:01 +00:00
Chalard Jean
32178ffe24 Merge "Address leftover comments on aosp/894233" am: fee09e64d5
am: d084f2ddd8

Change-Id: Ia08104f839ef37139a8761e2e625bb10c94c275f
2019-04-08 23:52:35 -07:00
Android Build Merger (Role)
236b3786e5 Merge "Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev am: 9b27e1f8b8" into qt-dev-plus-aosp 2019-04-09 06:50:19 +00:00
Remi NGUYEN VAN
4a2b373815 Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev
am: 9b27e1f8b8

Change-Id: If7d54cb1cf7f4f271c16cfbdc7629934800fddfc
2019-04-08 23:49:20 -07:00
Anil Admal
0e67b3543d Extend support for requestRouteToHostAddress for backward compatibility
The gnss@2.0 HAL and the framework GNSS Location Provider code is
updated in Q to not call the deprecated requestRouteToHost() method.
However, devices upgrading to Q which are still using gnss@1.1 or
earlier HAL must continued to be supported.

Fixes: 121222025
Test: Tested with gnss@1.1 HAL and first API level P.  The
      ConnectivityService log message "This method exists only for
      app backwards compatibility and must not be called by system
      services" is not present for devices with first API level P.

Change-Id: I10199776ea413dc256dbf0771e6cb3eedb334495
Merged-In: Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d
Merged-In: Ifa4ec98d5c942522dfd569664f169fa841d495ed
(cherry picked from commit 4360e7f31c)
2019-04-09 06:45:57 +00:00
Lorenzo Colitti
9947ff22b4 Fix flaky UdpEncapsulationSocket test
This commit reduces the flakiness of the
testOpenAndCloseUdpEncapsulationSocket by retrying up to three times.
Unfortunately, testing port-selected socket creation is racy against
other applications. This helps to handle the same race condition as done
in IpSecService#bindToRandomPort

Bug: 128024100
Test: 200x runs of testOpenAndCloseUdpEncapsulationSocket
Change-Id: I7e036ce821019dbac6c50899bd0894e89d2fe82a
Merged-In: Idf040a67e53d9b9ec6e6c647ce24f8ada501d355
Merged-In: Iad9aea4b42cd8b31a5a2659bb9cb54dd1c64e8b7
(cherry picked from commit a06b814245)
2019-04-09 06:44:32 +00:00
Remi NGUYEN VAN
9b84ea14a8 Merge "Expose captive portal urls for configuration" am: 07a100484f
am: 1245ea1fe5

Change-Id: I54050b28bbfb93e0b7e509dbe0e987a0b902b7d9
2019-04-08 23:40:05 -07:00
Chalard Jean
d084f2ddd8 Merge "Address leftover comments on aosp/894233"
am: fee09e64d5

Change-Id: I87f120778b2dc6743edc7fdd4e5390b68de05590
2019-04-08 23:38:53 -07:00
Remi NGUYEN VAN
1245ea1fe5 Merge "Expose captive portal urls for configuration"
am: 07a100484f

Change-Id: If5970fdafa7c624855ef9d29921542e2fb6fdfa0
2019-04-08 23:29:46 -07:00
Chalard Jean
fee09e64d5 Merge "Address leftover comments on aosp/894233" 2019-04-09 05:51:18 +00:00
Remi NGUYEN VAN
9b27e1f8b8 Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev 2019-04-09 05:16:29 +00:00
Remi NGUYEN VAN
07a100484f Merge "Expose captive portal urls for configuration" 2019-04-09 04:37:48 +00:00
Chalard Jean
061f7a7eef Address leftover comments on aosp/894233
Bug: 129510344
Test: m, boots, wifi connects, resolves DNS
Change-Id: Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613
2019-04-09 12:03:28 +09:00
Benedict Wong
4dba79cc89 Fix remove-before-add for IpSecService RefcountedResource
This patch fixes a bug where if a binder dies before the linkToDeath
call, the cleanup will be performed before the entry is added to the
array. While it is safe in that quotas and tracking performs as per
normal, the RefcountedRecord may not be cleaned up.

Rethrowing this exception is safe, since the only paths that would hit
this are all on binder threads coming from applications. Further, it
seems there is only one real way of this getting hit - if the app that
called the creation died during the binder call.

Bug: 126802451
Test: Compiled, CTS tests passing
Change-Id: I6db75853da9f29e1573512e26351623f22770c5d
2019-04-08 18:51:50 -07:00
Niklas Lindgren
741013d144 Expose captive portal urls for configuration
Carriers in Mainland China need to customize certain captive portal
urls. The main issue is that google servers are not accessible in
Mainland China.

Added the following captive portal resources to be targeted for overlay.
- config_captive_portal_http_url
- config_captive_portal_https_url
- config_captive_portal_fallback_urls (string-array)
- config_captive_portal_fallback_probe_specs (string-array)

These values can be customized for e g diffent countries

Bug: 111819230
Test: atest FrameworksNetTests NetworkStackTests
Test: Add a product RRO that targets a specific country code,
insert a SIM card that matches that country code and check the log
what URL is used.
Change-Id: I38a294a5e14417f65e96e76235ea153c53c4d7cc
2019-04-09 10:23:53 +09:00
Remi NGUYEN VAN
d5525d0691 Merge "[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: 900ff8694c -s ours am: d9e87833a2 -s ours
am: 1704d678ff -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 0b1e7e9243 is in history

Change-Id: If2094e6df4674d0c32f7d79b09b7f182d3284b3f
2019-04-08 16:40:42 -07:00
Anil Admal
f261e85650 Merge "Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: f7eaedccd6 am: b0e285dde7" into qt-dev-plus-aosp
am: 7fecc34996

Change-Id: Ifa4ec98d5c942522dfd569664f169fa841d495ed
2019-04-08 15:49:09 -07:00