Commit Graph

9665 Commits

Author SHA1 Message Date
TreeHugger Robot
b33a8f3bda Merge "Set transport types to resolver" into rvc-dev am: a6182bb9da am: 82682799d7
Change-Id: Ic7bd778f3b9cbc1255318174f0aa233e8604a7d6
2020-04-11 15:04:32 +00:00
TreeHugger Robot
595d2e9077 Merge "Set transport types to resolver" into rvc-dev am: a6182bb9da am: 45160bca9f
Change-Id: Iab511914c1d3337f32fd43a5dafb9d54a68abfe9
2020-04-11 14:52:46 +00:00
TreeHugger Robot
82682799d7 Merge "Set transport types to resolver" into rvc-dev am: a6182bb9da
Change-Id: I03fc5c62dfd9a51a78a720860531df282fdecc20
2020-04-11 14:42:34 +00:00
TreeHugger Robot
45160bca9f Merge "Set transport types to resolver" into rvc-dev am: a6182bb9da
Change-Id: I0ee02778a7e2a5bf54ec73edf34fe1a4d98c6ebe
2020-04-11 14:41:01 +00:00
TreeHugger Robot
a6182bb9da Merge "Set transport types to resolver" into rvc-dev 2020-04-11 14:25:27 +00:00
chenbruce
db2aad69ed Set transport types to resolver
For a given network, resolver doesn't know what transport types are.
Therefore, when a new network is created or transport types are changed
in a give network, transport types will be updated and sent by calling
setResolverConfiguration(). In the same time, if link properties or
transport types are null, setResolverConfiguration() won't be called.
The original behaviors of setResolverConfiguration() aren't changed.
Only increasing one new behavior that when a given network has transport
type change, calling setResolverConfiguration() directly and resolver
updates the transport types for that given network.

Bug: 143732914
Test: atest FrameworksNetTests
      atest FrameworksNetIntegrationTests
Change-Id: I6527cde0e177ba08c886576131b35fc769c2bb53
2020-04-11 14:39:59 +08:00
Chalard Jean
b50e46aaa3 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours am: 22164d8f4b -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 35a06972cc is in history

Change-Id: Iccf2b1edcb9fada0ce6b4a0310c75cc76cd5697f
2020-04-11 05:35:48 +00:00
Chalard Jean
10bfc9f962 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 am: dbcce5454b -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 35a06972cc is in history

Change-Id: I85be912aac50b5dd56f57a8962e98fdf641c2cb3
2020-04-11 05:34:19 +00:00
Chalard Jean
22164d8f4b [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 35a06972cc is in history

Change-Id: Iaa695bbf4cfdb71900b6b06b62db7222a0c0019d
2020-04-11 05:17:38 +00:00
Chalard Jean
dbcce5454b Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80
Change-Id: I82c5df71163bfe14a5d0eb6b8fb3628cb67defb6
2020-04-11 05:16:38 +00:00
Treehugger Robot
b9db69f623 Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627

Change-Id: I955b6dac6de48b12696dc640f131f5983ac552df
Merged-In: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
(cherry picked from commit 31492c708746a51f70c74913a4d6cd97bf06ae63, aosp/1284575)
2020-04-11 03:26:27 +00:00
Hall Liu
6f31ffa073 [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 24e6e442b7 am: 98e3a26b78 -s ours am: 7947b6459b -s ours
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 f4667b4925 is in history

Change-Id: I9e67f4166f73d05f23fe041206373ba32b421165
2020-04-11 01:22:00 +00:00
Hall Liu
7947b6459b [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 24e6e442b7 am: 98e3a26b78 -s ours
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 f4667b4925 is in history

Change-Id: Iedaadfdbb8a0308d0f602adda2569253f8dd0afd
2020-04-11 01:10:32 +00:00
Hall Liu
98e3a26b78 Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 24e6e442b7
Change-Id: I23df0fed3c46b2aeb3bf561e82460ffc41a6928c
2020-04-11 00:56:02 +00:00
Hall Liu
24e6e442b7 Merge changes from topic "phonestatelistener-limit-rvc-dev"
* changes:
  Add gating, logging for PhoneStateListener's limit
  Institute limit on PhoneStateListener
2020-04-11 00:36:13 +00:00
Xin Li
6b515671e8 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: 0a70e4c3d0 -s ours am: df46fa62d1
Change-Id: Iacf67657f069b367dc7c7b8aff7d3a292853ea0e
2020-04-10 19:27:37 +00:00
Xin Li
df46fa62d1 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: 0a70e4c3d0 -s ours
am skip reason: subject contains skip directive

Change-Id: I99ef66bbbf796a104bedf3da2909e47cbe023f6f
2020-04-10 19:07:11 +00:00
Xin Li
0a70e4c3d0 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master 2020-04-10 18:42:15 +00:00
Treehugger Robot
c9da3041b2 Merge "Fix a theoretical NPE" am: e21dccde6b am: 49021c2c68 am: e75cd4b458
Change-Id: Ief314b04963c0ddaf027823a21ee70e84870a94a
2020-04-10 18:06:28 +00:00
Treehugger Robot
e75cd4b458 Merge "Fix a theoretical NPE" am: e21dccde6b am: 49021c2c68
Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193
2020-04-10 17:08:04 +00:00
Treehugger Robot
49021c2c68 Merge "Fix a theoretical NPE" am: e21dccde6b
Change-Id: Idf4cb0acbfb9bc8fef43d42be477778e8ec2fc09
2020-04-10 16:44:25 +00:00
Treehugger Robot
e21dccde6b Merge "Fix a theoretical NPE" 2020-04-10 16:25:07 +00:00
Chalard Jean
35a06972cc Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627
Change-Id: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
2020-04-10 23:08:00 +09:00
Lucas Lin
5ee6637c32 [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 663817b515 -s ours am: e32dfcc505 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 ec5e7af977 is in history

Change-Id: I4e1d4eef651001c873c504cba74619a7864b8f2f
2020-04-09 03:25:40 +00:00
Lucas Lin
c42c6af0c6 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 663817b515
Change-Id: I6ca0f9041b3a3b30ee98a00420c08723c8a57be8
2020-04-09 03:12:57 +00:00
Lucas Lin
e32dfcc505 [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 663817b515 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 ec5e7af977 is in history

Change-Id: Icc020d872394b2bce4983b55a9fae96cff919c98
2020-04-09 03:12:50 +00:00
Lucas Lin
663817b515 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf
Change-Id: Ib99da397256138cb16ce7873df50996e1fe8be1a
2020-04-09 02:53:46 +00:00
Automerger Merge Worker
9c7451b0f0 Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 40384fb927" into rvc-d1-dev-plus-aosp 2020-04-08 10:17:33 +00:00
TreeHugger Robot
d5f2fde57d Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 082a9f45bf
Change-Id: I7ce37a993d3a8b7639ea0444ccd32af68f6b045b
2020-04-08 10:17:25 +00:00
TreeHugger Robot
a32ef981e4 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 40384fb927
Change-Id: Ia40c524903c7e66f26985f81f1aeafc291d9f5fd
2020-04-08 10:17:25 +00:00
lucaslin
311bd48fe8 Set WifiAwareNetworkInfo into setTransportInfo()
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
Merged-In: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
2020-04-08 10:09:16 +00:00
TreeHugger Robot
40384fb927 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92
Change-Id: Ie40d640964879d29cb62bcee2445e5bbefca508b
2020-04-08 10:00:02 +00:00
TreeHugger Robot
082a9f45bf Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92
Change-Id: Ib40ba2aeb8ed06e4d91a74cf8261af0f5eac2a66
2020-04-08 09:59:54 +00:00
Automerger Merge Worker
4989b94612 Merge "[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8 am: 24692c2351 -s ours" into rvc-d1-dev-plus-aosp 2020-04-08 08:11:56 +00:00
Lucas Lin
b2cb0b96ee [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8 am: 24692c2351 -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 3df2ebcb83 is in history

Change-Id: Ib543118f2dba2bd2960dbcb47e762ab16d3c3c10
2020-04-08 08:11:53 +00:00
Lucas Lin
21ca500db2 [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8 -s ours am: fed9c0d848 -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 3df2ebcb83 is in history

Change-Id: I3367950e4212e7539bce1f25b68830d7ffc04bab
2020-04-08 08:11:48 +00:00
lucaslin
ec5e7af977 Set WifiAwareNetworkInfo into setTransportInfo()
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
2020-04-08 08:11:10 +00:00
Lucas Lin
fed9c0d848 [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8 -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 3df2ebcb83 is in history

Change-Id: Iee0d435b8e41e3d99de864e481d97eed0fec5539
2020-04-08 07:53:59 +00:00
Lucas Lin
24692c2351 Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 37fbb256e8
Change-Id: Iffc785851bd1f84d54ef067ef8e555ba57587b2c
2020-04-08 07:53:43 +00:00
Lucas Lin
37fbb256e8 Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev 2020-04-08 07:40:30 +00:00
lucaslin
c12fcce03c Add more tests in NetworkCapabilitiesTest.java
Test deduceRestrictedCapability(), getAdministratorUids(),
setAdministratorUids(), getNetworkSpecifier(), getOwnerUid(),
setLinkDownstreamBandwidthKbps(), setLinkUpstreamBandwidthKbps(),
setSignalStrength() and Builder().

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Change-Id: I525941c47b71cd61ee872fd4d71b02a5d3767e21
Merged-In: I90c7a8c47710ea4ad8e8d2682c10440fd7f82270
2020-04-08 07:37:49 +00:00
Junyu Lai
9693c57752 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: 69784419af am: 4d73db7f19 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 7ab8d925bf is in history

Change-Id: Ie821930a73bb513ff59fb1dde962caff5e36d779
2020-04-08 06:07:03 +00:00
Junyu Lai
667cd0be15 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: 69784419af -s ours am: b9bf8efde6 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 ff97691273 is in history

Change-Id: I534109a6b808a76ae354627f56dfa5461440faa6
2020-04-08 06:06:40 +00:00
Junyu Lai
b9bf8efde6 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: 69784419af -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 ff97691273 is in history

Change-Id: I444aaab0fefdce73e31458da213d1e4a7ed2b95c
2020-04-08 06:00:09 +00:00
Junyu Lai
4d73db7f19 Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: 69784419af
Change-Id: I7bc25a66b6d1c50c29ea7810d0ec02f6c783e0b6
2020-04-08 05:56:49 +00:00
Junyu Lai
69784419af Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev 2020-04-08 05:55:57 +00:00
Chalard Jean
dbc4a88dcb [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours am: 4d07c3951a -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 77c7660522 is in history

Change-Id: Ia94c32fbc0e2aee1fd8d860b0ffc7068a5deb94d
2020-04-08 04:49:55 +00:00
Chalard Jean
9cfb37346c [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe am: 804ecccbdc -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 77c7660522 is in history

Change-Id: I55ddfc307214b110c223d91b3cc0cdd601d0aca1
2020-04-08 04:49:40 +00:00
Chalard Jean
804ecccbdc Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe
Change-Id: I24ed3891a893bf5cc6cc16b3210b2e4264008ce7
2020-04-08 04:37:32 +00:00
Chalard Jean
4d07c3951a [automerger skipped] Merge "Add trivial dependencies tests for the network stack" into rvc-dev am: 976f35b0fe -s ours
am skip reason: Change-Id Ie3c15ed25ef3088d3b9b650ffc7f34f49efa6b81 with SHA-1 77c7660522 is in history

Change-Id: I08107ba6c907bae11c1f304d82cde94d7ce2e306
2020-04-08 04:37:22 +00:00