Hall Liu
edc139757e
[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: e47879dcd4 -s ours
...
am skip reason: Change-Id I4d6681d90705b68c3349f4124e434a29b50fd3a2 with SHA-1 2ca7c9a422
2020-04-11 02:02:35 +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
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
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
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
153b346141
[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 am: a787e59ba5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id6726b54c852a05b536d2f653eba5317e87c81b9
2020-04-10 20:06:53 +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
Treehugger Robot
c81633a519
Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252 am: c53b4498be am: 0e51f38933 am: 8d2ccfc1dc
...
Change-Id: I762e107606d5974b04376711c256fd8758546854
2020-04-10 19:11:51 +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
099717e437
[automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: 6b21fc4608 -s ours am: 5eeba5f485 -s ours am: c3533010fd -s ours am: c61672e5ef -s ours
...
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 75f688be48
2020-04-09 03:47:58 +00: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
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
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
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
239c6e1549
Merge "Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: bc0ff3efe7" into rvc-d1-dev-plus-aosp am: 3eaeb2d109 am: 8ea6ed93ba
...
Change-Id: I13954939c52232cb208e718a80295b851b60e4f0
2020-04-08 10:48:18 +00:00
TreeHugger Robot
59a12af5ad
Merge "Set WifiAwareNetworkInfo into setTransportInfo()" into rvc-dev am: d8a5511b92 am: 5e896db967 am: 7c93981e5d am: 2e6d726dda
...
Change-Id: Ifb05f8217bc25727c5a04dde21191b7798e1dba6
2020-04-08 10:47:28 +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
39b885f596
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: 62ae466a7c -s ours
...
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc
2020-04-08 08:50:49 +00:00
Lucas Lin
378e3e6b5d
[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: 80180156fe -s ours
...
am skip reason: Change-Id I90c7a8c47710ea4ad8e8d2682c10440fd7f82270 with SHA-1 e408eb55dc
2020-04-08 08:48:44 +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
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
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
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
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
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
6d7cf63d81
[automerger skipped] Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: dd8bbd4996 am: 306f1d6506 -s ours am: fca9a2e500 -s ours am: 00b177833f -s ours
...
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 7192912f3e
2020-04-08 06:08:49 +00:00
Junyu Lai
3d60caf40a
[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: 4580583376 -s ours
...
am skip reason: Change-Id Ibf2f8118c459a8d7a0992deca8f0f339ccd1bcea with SHA-1 3bf1224afc
2020-04-08 06:08:30 +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
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
2020-04-08 06:07:47 +00:00
