Commit Graph

9748 Commits

Author SHA1 Message Date
Chalard Jean
ec3187ed64 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours am: 7509295d18 -s ours am: 5559d7de74 -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history

Change-Id: Icf75c23b34f91a046bf020c1b364cc05b8bb6653
2020-04-11 05:56:29 +00:00
Chalard Jean
6710d8fa3a [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 am: 567ec866ad -s ours am: c7dd81ecac -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history

Change-Id: I2e44ddc143a4a390e00bd1b20b663e38ea6c1d47
2020-04-11 05:55:54 +00:00
Chalard Jean
5559d7de74 [automerger skipped] Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80 -s ours am: 7509295d18 -s ours
am skip reason: Change-Id I08f57cce0cd85d5cd66e9a0ef948224290e9200e with SHA-1 5d8bc4b1ac is in history

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

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

Change-Id: Iaa695bbf4cfdb71900b6b06b62db7222a0c0019d
2020-04-11 05:17:38 +00:00
Chalard Jean
567ec866ad Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80
Change-Id: I82c5df71163bfe14a5d0eb6b8fb3628cb67defb6
2020-04-11 05:16:38 +00:00
Treehugger Robot
7d75bc365b 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
e47879dcd4 [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4 am: a7d042ad64 -s ours am: c1ec9a6d5b -s ours am: c383aa06c6 -s ours
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 2ca7c9a422 is in history

Change-Id: I05e94a1d4ef9247cad8cff962729d31819b3c25b
2020-04-11 01:42:23 +00:00
Hall Liu
c383aa06c6 [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4 am: a7d042ad64 -s ours am: c1ec9a6d5b -s ours
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 2ca7c9a422 is in history

Change-Id: I9e67f4166f73d05f23fe041206373ba32b421165
2020-04-11 01:22:00 +00:00
Hall Liu
c1ec9a6d5b [automerger skipped] Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4 am: a7d042ad64 -s ours
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 2ca7c9a422 is in history

Change-Id: Iedaadfdbb8a0308d0f602adda2569253f8dd0afd
2020-04-11 01:10:32 +00:00
Hall Liu
a7d042ad64 Merge changes from topic "phonestatelistener-limit-rvc-dev" am: 0167936be4
Change-Id: I23df0fed3c46b2aeb3bf561e82460ffc41a6928c
2020-04-11 00:56:02 +00:00
Hall Liu
0167936be4 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
a787e59ba5 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: c03f719e8b -s ours am: 8264f5a534 am: f00bd1e40f
Change-Id: I91747ec5175ea6af1f80ddf7ff5da9e1b7be06ff
2020-04-10 19:46:36 +00:00
Xin Li
f00bd1e40f [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: c03f719e8b -s ours am: 8264f5a534
Change-Id: Iacf67657f069b367dc7c7b8aff7d3a292853ea0e
2020-04-10 19:27:37 +00:00
Xin Li
8264f5a534 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: c03f719e8b -s ours
am skip reason: subject contains skip directive

Change-Id: I99ef66bbbf796a104bedf3da2909e47cbe023f6f
2020-04-10 19:07:11 +00:00
Treehugger Robot
8d2ccfc1dc Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252 am: c53b4498be am: 0e51f38933
Change-Id: Ia0944c7e7b3a2fd88e5e234d30e21e999e3fa1d4
2020-04-10 18:55:08 +00:00
Xin Li
c03f719e8b 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
0e51f38933 Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252 am: c53b4498be
Change-Id: Ief314b04963c0ddaf027823a21ee70e84870a94a
2020-04-10 18:06:28 +00:00
Treehugger Robot
c53b4498be Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252
Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193
2020-04-10 17:08:04 +00:00
Treehugger Robot
92c8e43252 Merge "Fix a theoretical NPE" am: 6334d49d44
Change-Id: Idf4cb0acbfb9bc8fef43d42be477778e8ec2fc09
2020-04-10 16:44:25 +00:00
Treehugger Robot
6334d49d44 Merge "Fix a theoretical NPE" 2020-04-10 16:25:07 +00:00
Chalard Jean
5d8bc4b1ac Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627
Change-Id: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
2020-04-10 23:08:00 +09:00
Lucas Lin
c61672e5ef [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours am: 5eeba5f485 -s ours am: c3533010fd -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48 is in history

Change-Id: I372c705abd5ce3bb1dd99f1a64804607790a2581
2020-04-09 03:35:13 +00:00
Lucas Lin
c3533010fd [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours am: 5eeba5f485 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48 is in history

Change-Id: I4e1d4eef651001c873c504cba74619a7864b8f2f
2020-04-09 03:25:40 +00:00
Lucas Lin
96aa080ffe Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608
Change-Id: I6ca0f9041b3a3b30ee98a00420c08723c8a57be8
2020-04-09 03:12:57 +00:00
Lucas Lin
5eeba5f485 [automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48 is in history

Change-Id: Icc020d872394b2bce4983b55a9fae96cff919c98
2020-04-09 03:12:50 +00:00
Lucas Lin
6b21fc4608 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf
Change-Id: Ib99da397256138cb16ce7873df50996e1fe8be1a
2020-04-09 02:53:46 +00:00
Automerger Merge Worker
8ea6ed93ba Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: bc0ff3efe7" into rvc-d1-dev-plus-aosp am: 3eaeb2d109
Change-Id: I994d8dafb0ed29924bc9975211c110e04b0901e1
2020-04-08 10:35:25 +00:00
TreeHugger Robot
2e6d726dda Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 5e896db967 am: 7c93981e5d
Change-Id: I097956b80619ca8f16d1717f0d3e4496777a8afd
2020-04-08 10:35:11 +00:00
Automerger Merge Worker
3eaeb2d109 Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: bc0ff3efe7" into rvc-d1-dev-plus-aosp 2020-04-08 10:17:33 +00:00
TreeHugger Robot
7c93981e5d Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 5e896db967
Change-Id: I7ce37a993d3a8b7639ea0444ccd32af68f6b045b
2020-04-08 10:17:25 +00:00
TreeHugger Robot
a500426b70 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: bc0ff3efe7
Change-Id: Ia40c524903c7e66f26985f81f1aeafc291d9f5fd
2020-04-08 10:17:25 +00:00
lucaslin
15586a5bae 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
bc0ff3efe7 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92
Change-Id: Ie40d640964879d29cb62bcee2445e5bbefca508b
2020-04-08 10:00:02 +00:00
TreeHugger Robot
5e896db967 Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92
Change-Id: Ib40ba2aeb8ed06e4d91a74cf8261af0f5eac2a66
2020-04-08 09:59:54 +00:00
Automerger Merge Worker
62ae466a7c Merge "[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f am: 62b8f38312 -s ours" into rvc-d1-dev-plus-aosp am: 8f44b722ff -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: I053eb039dade1f30148feaec8a10eca52a26424b
2020-04-08 08:29:39 +00:00
Lucas Lin
80180156fe [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f -s ours am: f3d9033a9e -s ours am: f988f41260 -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: Ie65f3f0ed36266df21a59b6a4899f6553893502d
2020-04-08 08:28:50 +00:00
Automerger Merge Worker
8f44b722ff Merge "[automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f am: 62b8f38312 -s ours" into rvc-d1-dev-plus-aosp 2020-04-08 08:11:56 +00:00
Lucas Lin
165ddef185 [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f am: 62b8f38312 -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: Ib543118f2dba2bd2960dbcb47e762ab16d3c3c10
2020-04-08 08:11:53 +00:00
Lucas Lin
f988f41260 [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f -s ours am: f3d9033a9e -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: I3367950e4212e7539bce1f25b68830d7ffc04bab
2020-04-08 08:11:48 +00:00
lucaslin
75f688be48 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
f3d9033a9e [automerger skipped] Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f -s ours
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc is in history

Change-Id: Iee0d435b8e41e3d99de864e481d97eed0fec5539
2020-04-08 07:53:59 +00:00
Lucas Lin
62b8f38312 Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev am: 1f4713bd4f
Change-Id: Iffc785851bd1f84d54ef067ef8e555ba57587b2c
2020-04-08 07:53:43 +00:00
Lucas Lin
1f4713bd4f Merge "Add more tests in NetworkCapabilitiesTest.java" into rvc-dev 2020-04-08 07:40:30 +00:00
lucaslin
7bc3c6f517 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
00b177833f [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 am: 306f1d6506 -s ours am: fca9a2e500 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 7192912f3e is in history

Change-Id: I51d04711e65cfec76d810114b597e7d4ebdd8513
2020-04-08 06:08:06 +00:00
Junyu Lai
4580583376 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 -s ours am: d8e86b04d8 -s ours am: 370b580332 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 3bf1224afc is in history

Change-Id: Ibdfe6c78c30026ffbb3133e0f1e1653dc0372700
2020-04-08 06:07:47 +00:00
Junyu Lai
fca9a2e500 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 am: 306f1d6506 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 7192912f3e is in history

Change-Id: Ie821930a73bb513ff59fb1dde962caff5e36d779
2020-04-08 06:07:03 +00:00
Junyu Lai
370b580332 [automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 -s ours am: d8e86b04d8 -s ours
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 3bf1224afc is in history

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

Change-Id: I444aaab0fefdce73e31458da213d1e4a7ed2b95c
2020-04-08 06:00:09 +00:00