Commit Graph

9067 Commits

Author SHA1 Message Date
Lucas Lin
66dc3653df [automerger skipped] Merge "Fix NetworkCapabilitiesTest fail on Q device" am: b1bf1f2d36 am: 4c3ce3670c -s ours
am skip reason: Change-Id I602ae32dae1ad29fe3293c541fa6d2cef01b81d3 with SHA-1 88cef1a242 is in history

Change-Id: Id82ae0b4426104a64758a9426e165d1c69087379
2020-03-30 08:20:35 +00:00
Lucas Lin
4c3ce3670c Merge "Fix NetworkCapabilitiesTest fail on Q device" am: b1bf1f2d36
Change-Id: I591b621bb8b659aa7d0c163b20d03952589db428
2020-03-30 08:06:30 +00:00
Xiao Ma
b57e276a52 [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: 18511e3b08 -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 07a17aaa51 is in history

Change-Id: Ieb1ca59f2c72ac7ce731544cffeb8d48ad40561c
2020-03-30 08:06:18 +00:00
Xiao Ma
18511e3b08 Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev 2020-03-30 07:46:30 +00:00
Lucas Lin
b1bf1f2d36 Merge "Fix NetworkCapabilitiesTest fail on Q device" 2020-03-30 07:41:01 +00:00
Aaron Huang
3425e2651a Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e am: a6bdfda91b
Change-Id: Ifab1167a15748d6b774ab9939562e337c73d7da7
2020-03-30 06:38:49 +00:00
Aaron Huang
a6bdfda91b Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e
Change-Id: I46148a6d1db0a64006cc1e0d829a0d472a37dda3
2020-03-30 06:25:55 +00:00
Aaron Huang
9d66de5d5e Merge "Make LinkPropertiesTest compatible with Q" 2020-03-30 06:06:32 +00:00
Xiao Ma
ef40b406c5 Add CTS tests for ApfCapabilities static APIs.
Add tests for getApfEtherTypeBlackList and getApfDrop8023Frames APIs.

Bug: 150640397
Test: atest CtsNetTestCasesLatestSdk:android.net.apf.ApfCapabilitiesTest
      on both of Q and R devices.

Change-Id: I11555934df4b27cbb6b7ddbb81022d8fb7c25e15
Merged-In: I11555934df4b27cbb6b7ddbb81022d8fb7c25e15
(cherry picked from commit 7d51a72487dba5b2747a9de12f50ba2087007264)
2020-03-30 05:41:02 +00:00
TreeHugger Robot
aa7e7dabc9 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 9eb9399321 is in history

Change-Id: Ifc19fecc1f19504a693eb8f2816c529853abbaf3
2020-03-30 04:39:24 +00:00
lucaslin
be8bbacfa2 Fix NetworkCapabilitiesTest fail on Q device
The getSSID() has changed to getSsid() in Android R, adding
isAtLeastR() to prevent NetworkCapabilitiesTest fail on Android
Q.

Bug: 151322799
Test: Run "atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest"
      on Android Q & R device.
Change-Id: I602ae32dae1ad29fe3293c541fa6d2cef01b81d3
Merged-In: I602ae32dae1ad29fe3293c541fa6d2cef01b81d3
2020-03-30 03:47:00 +00:00
Lucas Lin
ac0d8ed4e8 Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7 am: b98484701c
Change-Id: I785f9d510b96acbed2925fd1af3b46829c494d1e
2020-03-30 03:42:57 +00:00
Lucas Lin
ec3a3796bf Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f
Change-Id: I02ba7c8eaeb9218815f12960c1514350b0b27399
2020-03-30 03:42:28 +00:00
Remi NGUYEN VAN
da337f3100 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: e3aade0a30 am: 8b5ae551f9 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 d7d24015a5 is in history

Change-Id: Id4a9f21ae303960d29835443517cc7ae7c87f470
2020-03-30 03:40:28 +00:00
Lucas Lin
b98484701c Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7
Change-Id: I189592ddfaa5ad75e0613f8b8468022a3af885c7
2020-03-30 03:15:44 +00:00
Lucas Lin
42cf91c65f Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4
Change-Id: I9bb5c2c32a363d384cbf89b05ea4b2a41217581e
2020-03-30 03:15:06 +00:00
Lucas Lin
28ff516ba7 Merge "Add MatchAllNetworkSpecifierTest" 2020-03-30 03:08:48 +00:00
Lucas Lin
246821b7b4 Merge "Add more tests in LinkPropertiesTests.java" 2020-03-30 03:08:40 +00:00
Remi NGUYEN VAN
8b5ae551f9 Merge "Create a builder for NetworkCapabilities." am: e3aade0a30
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
e3aade0a30 Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Mark Chien
9904c69fa5 Unbreak testStartUsingNetworkFeature_enableHipri failure
aosp/1261619 break legacy API that only supported for SDK which is
smaller than android M, caller need to have network stack permission
to request network with legacy type. Fix failure by whitelist permission
check for the caller who built with order SDK(< M).

Bug: 152229492
Test: atest CtsTetheringTest
      atest ConnectivityManagerLegacyTest# \
      testStartUsingNetworkFeature_enableHipri

Change-Id: I02504c0eed10ee4e08c8fbf032951022255ba5fa
Merged-In: I367dff0429f26f266282300edc38637b55eece38
(cherry picked from commit b1c8acf0d6ba1fe35d8e81673d2c5c24fa2fea79)
2020-03-30 02:26:57 +00:00
Hall Liu
ab3ad14a00 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: f5d30b7870
Change-Id: I0f8dd0d1f7383e94b394cead42113c848b5b8ad4
2020-03-28 06:50:32 +00:00
Hall Liu
f5d30b7870 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev
* changes:
  Add gating, logging for PhoneStateListener's limit
  Institute limit on PhoneStateListener
2020-03-28 06:48:56 +00:00
Hall Liu
f4667b4925 Add gating, logging for PhoneStateListener's limit
Add gating via PlatformCompat and DeviceConfig and logging via
PlatformCompat to the limit instituted on per-process listeners

Fixes: 152074216
Test: atest CtsTelephonyHostCases
Change-Id: I4d6681d90705b68c3349f4124e434a29b50fd3a2
2020-03-27 19:21:51 -07:00
Chalard Jean
ec85550d64 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: 199c91b659
Change-Id: I041fa5232ac2f653f0ff9070b9bcd924345f9987
2020-03-27 22:56:26 +00:00
Chalard Jean
199c91b659 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
  Update the NetworkProvider API for council comments
2020-03-27 22:50:42 +00:00
Cody Kesting
fec7877661 [automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: 26177212ed -s ours
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 807ce6621b is in history

Change-Id: I2e8071232c2a866f1c6540cb2d43988d30a4ee65
2020-03-27 19:22:07 +00:00
Cody Kesting
26177212ed Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev 2020-03-27 19:09:00 +00:00
Cody Kesting
3f3c426c35 [automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 5657f9c83c -s ours
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 d759ac61ee is in history

Change-Id: I2a85d7ddc2fc3e6594e19591b589014d65b8b6f7
2020-03-27 18:35:43 +00:00
Cody Kesting
5657f9c83c Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev 2020-03-27 18:22:20 +00:00
Mark Chien
a47b4aca38 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 0b3d643758 am: d53c48616f
Change-Id: Ifedc9c8825550bc5ec5c32c46d0cd0f48d016b5e
2020-03-27 15:58:49 +00:00
Mark Chien
d53c48616f Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 0b3d643758
Change-Id: I30eefa35d19f0a2dd8382fc3f63470d1aeb0dea9
2020-03-27 15:45:06 +00:00
Mark Chien
0b3d643758 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" 2020-03-27 15:28:09 +00:00
Chalard Jean
51b8e287ad Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
2020-03-27 23:46:30 +09:00
markchien
9eb9399321 Unbreak testStartUsingNetworkFeature_enableHipri failure
aosp/1261619 break legacy API that only supported for SDK which is
smaller than android M, caller need to have network stack permission
to request network with legacy type. Fix failure by whitelist permission
check for the caller who built with oder SDK(< M).

Bug: 152229492
Test: atest CtsTetheringTest
      atest ConnectivityManagerLegacyTest# \
      testStartUsingNetworkFeature_enableHipri

Change-Id: I367dff0429f26f266282300edc38637b55eece38
2020-03-27 14:15:13 +00:00
Daulet Zhanguzin
c548c90e1a [automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 053fb7317e am: 658f6d9465 -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 d4e7dd113d is in history

Change-Id: Ib70273007ee56039d0645f33f59c677ea5f7b1aa
2020-03-27 12:28:12 +00:00
Daulet Zhanguzin
658f6d9465 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 053fb7317e
Change-Id: I9f9ba24036e19f568942466c866c7be23112c10a
2020-03-27 12:07:53 +00:00
Daulet Zhanguzin
053fb7317e Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 2020-03-27 11:53:39 +00:00
Chalard Jean
812e8cb87e Address further API council comments.
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I8a785ae0e74e659c317deaaa28c203356c7766ed
2020-03-27 17:57:24 +09:00
Chalard Jean
fd23dbbf07 Update the NetworkProvider API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Change-Id: I6b086572cfc72a0727f4510351cff0e74cbc4302
2020-03-27 17:53:05 +09:00
Aaron Huang
7988471ec9 Make LinkPropertiesTest compatible with Q
CompareResult had been moved from LinkProperties to LinkPropertiesUtils
so this change ignores testCompareResult() on Q and only check
compareAllRoutes() works while android version is at least R.

Bug: 151782584
Test: atest CtsNetTestCasesLatestSdk:LinkPropertiesTest
Change-Id: I38b0d83abf983b3bcc01fc6aea2e5cc307734198
2020-03-27 16:41:21 +08:00
Aaron Huang
6e8047057d [automerger skipped] Merge "API review: access field by method" am: a09a992749 am: d9f35a57b5 -s ours
am skip reason: Change-Id Id01e6135193716cc21bba11da529bf1507a954f7 with SHA-1 410236b92e is in history

Change-Id: I495064712b7d8fca42aa78a153eddfbf28d3b64e
2020-03-27 07:46:51 +00:00
Aaron Huang
d9f35a57b5 Merge "API review: access field by method" am: a09a992749
Change-Id: I68041686393f73a38dcd49f6fcd5bd5930f6054d
2020-03-27 07:24:02 +00:00
Aaron Huang
a09a992749 Merge "API review: access field by method" 2020-03-27 07:03:25 +00:00
Chalard Jean
58603f3a63 Merge changes from topic "networkagent_api" into rvc-dev am: f79df94011
Change-Id: If16fd956e2d694fa36492cc1a1512a9d12dee3dd
2020-03-27 06:23:56 +00:00
Chalard Jean
f79df94011 Merge changes from topic "networkagent_api" into rvc-dev
* changes:
  Update NetworkAgentConfig API for council comments
  Update the NetworkAgent API for council comments
2020-03-27 06:20:37 +00:00
Daulet Zhanguzin
ee67425c05 Replace com.android.internal.util.Preconditions.checkNotNull with
java.util.Objects.requireNonNull

Bug: 126528330
Bug: 149348618

Test: Treehugger
Change-Id: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
Merged-In: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
2020-03-26 12:44:56 +00:00
lucaslin
55c6a844fc Add more tests in LinkPropertiesTests.java
Test getAllInterfaceNames(), hasIpv4DefaultRoute(),
hasIpv4DnsServer() and hasIpv6DnsServer().

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:android.net.LinkPropertiesTest
Change-Id: Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f
2020-03-26 19:15:55 +08:00
lucaslin
5bf0d2de9d Add MatchAllNetworkSpecifierTest
Bug: 139268426
Bug: 135998869
Test: atest CtsNetTestCasesLatestSdk:MatchAllNetworkSpecifierTest
Change-Id: Ib593708d5621ff20e6a0c31e5698b2b658f64d45
2020-03-26 18:58:08 +08:00
Xiao Ma
07a17aaa51 Merge "Add CTS tests for ApfCapabilities static APIs." am: 854b55854b am: 1b7eddd68e
Change-Id: I11555934df4b27cbb6b7ddbb81022d8fb7c25e15
2020-03-26 01:36:53 +00:00