Hall Liu
2fa88bc8a8
Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: 9a5e26ef77 am: 921f9b4572
...
Change-Id: Idc2c2537f2fd175f1d3fbba62935b463917dc420
2020-03-28 07:10:24 +00:00
Hall Liu
921f9b4572
Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: 9a5e26ef77
...
Change-Id: Ic9004aa98a71d52c45c88a5636970f7e156cbca0
2020-03-28 06:55:28 +00:00
Hall Liu
9a5e26ef77
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
2ca7c9a422
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
c82408c42b
Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: f7c2921f91 am: 962be5ead0
...
Change-Id: I394af0d00dec285120e9d2b01c58680748929dec
2020-03-27 23:07:02 +00:00
Chalard Jean
e08baf1e3b
Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: f7c2921f91 am: bc5149723a
...
Change-Id: I55073e2f5f5bb9293fe2871d8cf82f70ff11ef02
2020-03-27 23:02:38 +00:00
Chalard Jean
ba6f549dc5
Address further API council comments. am: c882f64b3c am: 2616b2bbb0
...
Change-Id: I501465f42c9f476637df652633d006e950d45c8a
2020-03-27 23:02:33 +00:00
Chalard Jean
71c3b6cb9c
Update the NetworkProvider API for council comments am: 4c7368a340 am: 750bd91aa5
...
Change-Id: I9e17c9d45e3590f699d612977f16323cd0b908b6
2020-03-27 23:02:26 +00:00
Chalard Jean
bc5149723a
Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: f7c2921f91
...
Change-Id: Ie0cf94ac30f7edd36aaf82344c68a18d13d7a45c
2020-03-27 22:58:45 +00:00
Chalard Jean
2616b2bbb0
Address further API council comments. am: c882f64b3c
...
Change-Id: I539d05a584c40606f0f27bff06e9585407b53cd8
2020-03-27 22:58:41 +00:00
Chalard Jean
750bd91aa5
Update the NetworkProvider API for council comments am: 4c7368a340
...
Change-Id: If7798e35b8c8f4ba4b70cedd9689dcf84caf140f
2020-03-27 22:58:34 +00:00
Chalard Jean
962be5ead0
Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: f7c2921f91
...
Change-Id: I041fa5232ac2f653f0ff9070b9bcd924345f9987
2020-03-27 22:56:26 +00:00
Chalard Jean
f7c2921f91
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
5ad0111a2d
[automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6 am: ede1ab6af0 -s ours
...
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 aa7f80a5d8 is in history
Change-Id: I02312f60a1d41a2dcc9e9ba655e7542a450b4ddb
2020-03-27 19:39:04 +00:00
Cody Kesting
2f7595de71
[automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6 -s ours am: da504db4c6 -s ours
...
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 081da59c0e is in history
Change-Id: Iabd4f83d8e7308789135f407bbe9a550b75652ec
2020-03-27 19:33:30 +00:00
Cody Kesting
ede1ab6af0
Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6
...
Change-Id: Icff8ed1cf90927e521c8294aaec8bfdd6a4ccc4d
2020-03-27 19:23:37 +00:00
Cody Kesting
da504db4c6
[automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: fc0eed5aa6 -s ours
...
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 081da59c0e is in history
Change-Id: I2e8071232c2a866f1c6540cb2d43988d30a4ee65
2020-03-27 19:22:07 +00:00
Cody Kesting
fc0eed5aa6
Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev
2020-03-27 19:09:00 +00:00
Automerger Merge Worker
661eff54e7
Merge "[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734 am: f4597a69da -s ours" into rvc-d1-dev-plus-aosp
2020-03-27 18:54:39 +00:00
Cody Kesting
99692a13db
[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734 am: f4597a69da -s ours
...
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 e385a7a90a is in history
Change-Id: I0e495d8cc6bc172bdb248cefd6d812c5918fe1f7
2020-03-27 18:54:33 +00:00
Cody Kesting
06b84a0e09
[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734 -s ours am: b7e7fac6ef -s ours
...
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 e385a7a90a is in history
Change-Id: I57e4ada96a1fc0f95f9a90fed17a04753a7ce73f
2020-03-27 18:54:27 +00:00
Cody Kesting
f4597a69da
Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734
...
Change-Id: Ibd8c0920b66899d36058f249904d33fe14ce9504
2020-03-27 18:38:07 +00:00
Cody Kesting
b7e7fac6ef
[automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 488c8e4734 -s ours
...
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 e385a7a90a is in history
Change-Id: I2a85d7ddc2fc3e6594e19591b589014d65b8b6f7
2020-03-27 18:35:43 +00:00
Cody Kesting
488c8e4734
Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev
2020-03-27 18:22:20 +00:00
Mark Chien
2f8d886890
Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: db96b34bf7 am: 10f581540e am: 1be7fb946c
...
Change-Id: I51f00fb99526557181cedb7542cce8d10b362a11
2020-03-27 16:20:07 +00:00
Mark Chien
1be7fb946c
Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: db96b34bf7 am: 10f581540e
...
Change-Id: Ifedc9c8825550bc5ec5c32c46d0cd0f48d016b5e
2020-03-27 15:58:49 +00:00
Mark Chien
10f581540e
Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: db96b34bf7
...
Change-Id: I30eefa35d19f0a2dd8382fc3f63470d1aeb0dea9
2020-03-27 15:45:06 +00:00
Mark Chien
db96b34bf7
Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure"
2020-03-27 15:28:09 +00:00
Chalard Jean
e693268f50
Rename satisfiedBy into canBeSatisfiedBy
...
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
2020-03-27 23:46:30 +09:00
markchien
7fae6eae10
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
7a098c1594
[automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: d49cc3d8c2 am: f954f47bc8 -s ours am: baaade8cdc -s ours
...
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 04aca231be is in history
Change-Id: I99ef30e8307aca34d78d1beb733b1ecd1b8d402e
2020-03-27 12:34:23 +00:00
Daulet Zhanguzin
baaade8cdc
[automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: d49cc3d8c2 am: f954f47bc8 -s ours
...
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 04aca231be is in history
Change-Id: Ib70273007ee56039d0645f33f59c677ea5f7b1aa
2020-03-27 12:28:12 +00:00
Daulet Zhanguzin
f954f47bc8
Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: d49cc3d8c2
...
Change-Id: I9f9ba24036e19f568942466c866c7be23112c10a
2020-03-27 12:07:53 +00:00
Daulet Zhanguzin
d49cc3d8c2
Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
2020-03-27 11:53:39 +00:00
Chalard Jean
c882f64b3c
Address further API council comments.
...
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I8a785ae0e74e659c317deaaa28c203356c7766ed
2020-03-27 17:57:24 +09:00
Chalard Jean
4c7368a340
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
bfc120c5ad
[automerger skipped] Merge "API review: access field by method" am: 1c556c813c am: c145a18f79 -s ours am: b721b422e8 -s ours
...
am skip reason: Change-Id Id01e6135193716cc21bba11da529bf1507a954f7 with SHA-1 c3e9562525 is in history
Change-Id: Ia637e86cfbf93a6206fc4e7af11a52e373039efd
2020-03-27 08:03:33 +00:00
Aaron Huang
b721b422e8
[automerger skipped] Merge "API review: access field by method" am: 1c556c813c am: c145a18f79 -s ours
...
am skip reason: Change-Id Id01e6135193716cc21bba11da529bf1507a954f7 with SHA-1 c3e9562525 is in history
Change-Id: I495064712b7d8fca42aa78a153eddfbf28d3b64e
2020-03-27 07:46:51 +00:00
Aaron Huang
c145a18f79
Merge "API review: access field by method" am: 1c556c813c
...
Change-Id: I68041686393f73a38dcd49f6fcd5bd5930f6054d
2020-03-27 07:24:02 +00:00
Aaron Huang
1c556c813c
Merge "API review: access field by method"
2020-03-27 07:03:25 +00:00
Chalard Jean
baca524a81
Merge changes from topic "networkagent_api" into rvc-dev am: 6d25213263 am: c03489e3fa
...
Change-Id: Ib3ecee84d48693407fcd9d59bee76843c3e3ca0b
2020-03-27 06:44:08 +00:00
Chalard Jean
a16deee3df
Merge changes from topic "networkagent_api" into rvc-dev am: 6d25213263 am: a51e3d1b49
...
Change-Id: I5cc731fe5c5149bdc1bcc4cc9fac673a2e8f14c6
2020-03-27 06:43:14 +00:00
Chalard Jean
c03489e3fa
Merge changes from topic "networkagent_api" into rvc-dev am: 6d25213263
...
Change-Id: If16fd956e2d694fa36492cc1a1512a9d12dee3dd
2020-03-27 06:23:56 +00:00
Chalard Jean
a51e3d1b49
Merge changes from topic "networkagent_api" into rvc-dev am: 6d25213263
...
Change-Id: Ie7e013eabbe39c96dc058c25aed520093131771e
2020-03-27 06:23:44 +00:00
Chalard Jean
6d25213263
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
08334a14c7
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
Xiao Ma
495773f9e5
Merge "Add CTS tests for ApfCapabilities static APIs." am: e1f0d9a0d3 am: 1ff77a4fa2 am: 8d46a09b50
...
Change-Id: Ie4568fe811d8a991b9c16f98de436e07f7b7da37
2020-03-26 01:51:23 +00:00
Xiao Ma
8d46a09b50
Merge "Add CTS tests for ApfCapabilities static APIs." am: e1f0d9a0d3 am: 1ff77a4fa2
...
Change-Id: I11555934df4b27cbb6b7ddbb81022d8fb7c25e15
2020-03-26 01:36:53 +00:00
Xiao Ma
1ff77a4fa2
Merge "Add CTS tests for ApfCapabilities static APIs." am: e1f0d9a0d3
...
Change-Id: I6679b26173339eb6fbb9fa0b08de7f9fb0751148
2020-03-26 01:36:06 +00:00
Xiao Ma
e1f0d9a0d3
Merge "Add CTS tests for ApfCapabilities static APIs."
2020-03-26 01:22:05 +00:00