Chalard Jean
e37aaf54ad
Merge "Reland: CaptivePortalData: use CharSequence in VenueFriendlyName API" into sc-dev
2021-03-19 14:26:06 +00:00
Remi NGUYEN VAN
75689f7cdb
Merge "Move NetworkUtils JNI out of core/jni" into sc-dev
2021-03-19 13:42:54 +00:00
Chiachang Wang
6ae5f25ede
Merge "Add startCaptivePortalApp to system API" am: 9e18198cc5 am: b01cafdb08 am: 48c2c5949f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639899
Change-Id: Ia3be29892f62b82d23a165bc8334a083c674aefb
2021-03-19 13:09:03 +00:00
Chiachang Wang
48c2c5949f
Merge "Add startCaptivePortalApp to system API" am: 9e18198cc5 am: b01cafdb08
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639899
Change-Id: I7e82a2a8efb13b960b8f79b9646fcac07c7ac569
2021-03-19 12:26:42 +00:00
Chiachang Wang
b01cafdb08
Merge "Add startCaptivePortalApp to system API" am: 9e18198cc5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639899
Change-Id: I2efbc3276ccce8df4d77c06dc2d50bd4d2bed9b5
2021-03-19 11:59:16 +00:00
Chalard Jean
4f7e05ccae
Merge "[NS03] Mix in other CS-managed properties" am: dc2fed3454 am: 4ff025d8a5 am: be8093b125
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101
Change-Id: I20c4d8392dba72b142cd9cdf15bed94d52848b81
2021-03-19 11:32:34 +00:00
Lucas Lin
ee8ed23808
Merge "Expose getCapabilities" am: 0f441f7bdd am: e988cf4321 am: bf42eae162
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919
Change-Id: I9a6b6f405ee4b7d5d03173d6c5e22e1018dc3417
2021-03-19 11:32:07 +00:00
Treehugger Robot
5654c21221
[automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: cd3ea1f002 -s ours am: e58eafa8c4 -s ours am: 363f1b34c4 -s ours
...
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cb5fd4a670 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646326
Change-Id: Ib90dc576f29662385479a9f7bbb16cdca13ef826
2021-03-19 11:31:48 +00:00
Chiachang Wang
9e18198cc5
Merge "Add startCaptivePortalApp to system API"
2021-03-19 11:30:20 +00:00
Chalard Jean
be8093b125
Merge "[NS03] Mix in other CS-managed properties" am: dc2fed3454 am: 4ff025d8a5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101
Change-Id: I6c325a102c93459a377e0a8670176f0989f88738
2021-03-19 11:07:51 +00:00
Lucas Lin
bf42eae162
Merge "Expose getCapabilities" am: 0f441f7bdd am: e988cf4321
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919
Change-Id: I5a7df27d7b6f7eca0364c3d88d4ad8663063cb3e
2021-03-19 11:07:40 +00:00
Treehugger Robot
363f1b34c4
[automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: cd3ea1f002 -s ours am: e58eafa8c4 -s ours
...
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cc8f26dea8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646326
Change-Id: Iffa4b2d7c7a9d03a70a6a01a545bb91e88bfebb1
2021-03-19 11:07:23 +00:00
Remi NGUYEN VAN
8f0031d7aa
Move NetworkUtils JNI out of core/jni
...
Keep the utilities included via a library, but move them out of
core/jni, and prepare a library to package them together with
framework-connectivity.
Also remove unnecessary dependencies in framework-connectivity.
Bug: 171540887
Test: device boots and has connectivity
Change-Id: I0b55dfe92f3cb6e848d79ac7953756f39aaa2597
2021-03-19 11:01:17 +00:00
Chalard Jean
4ff025d8a5
Merge "[NS03] Mix in other CS-managed properties" am: dc2fed3454
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101
Change-Id: I7b904af6c34190f53378cc1acc518840b527d434
2021-03-19 10:52:23 +00:00
Remi NGUYEN VAN
abba870866
Merge "Move connectivity AIDLs to android.net" into sc-dev
2021-03-19 10:51:22 +00:00
Lucas Lin
e988cf4321
Merge "Expose getCapabilities" am: 0f441f7bdd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919
Change-Id: Ie524f7538aa7a7048c55097c0995d8c6194dc682
2021-03-19 10:49:12 +00:00
Treehugger Robot
e58eafa8c4
[automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: cd3ea1f002 -s ours
...
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cc8f26dea8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646326
Change-Id: I19a6e876187a5cf64a00c3f2dac15c8bec8f2911
2021-03-19 10:46:12 +00:00
Chiachang Wang
d8802f6968
Merge "Expose constants of ConnectivityManager" into sc-dev
2021-03-19 10:40:49 +00:00
Chalard Jean
dc2fed3454
Merge "[NS03] Mix in other CS-managed properties"
2021-03-19 10:32:46 +00:00
Chiachang Wang
293900ff01
Merge changes from topic "replaceUidRange" into sc-dev
...
* changes:
Expose uids related APIs in NetworkRequest and NetworkCapabilities
Replace the usage of UidRange
2021-03-19 10:32:30 +00:00
Lucas Lin
0f441f7bdd
Merge "Expose getCapabilities"
2021-03-19 10:24:25 +00:00
Paul Hu
e6acab8b9a
Merge "Remove unused NetworkPolicyManagerInternal in CS" into sc-dev
2021-03-19 10:21:40 +00:00
Treehugger Robot
cd3ea1f002
Merge "Reland "Add an API to listen for changes in network blocked status of an uid.""
2021-03-19 10:12:15 +00:00
Chiachang Wang
e79617978f
Merge "Send a Network instead of network id for wifi no internet dialog" am: 94dc99ea38 am: 3ff1e2fe49 am: 7bbc040746
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766
Change-Id: I54259f3084560fe457e3108dee815d0e305675c2
2021-03-19 09:43:49 +00:00
Aaron Huang
511a67f767
Merge "Remove hidden API usage from ProxyTracker" am: ed15b01b0d am: 2f04604df2 am: 330ba163d9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646966
Change-Id: I4c5e91ae575c5cd79198a47572a7403e12d64dfa
2021-03-19 09:43:21 +00:00
Lorenzo Colitti
c5f2fd7fb7
Merge "Ensure all calls to getCallingUid use the version in mDeps." am: a6b1b9d110 am: 18e2734d2f am: c3b003da37
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635320
Change-Id: I064e02172a86cd68afb757004102c68ce331dda6
2021-03-19 09:42:53 +00:00
Hai Shalom
5ee45003b4
Reland: CaptivePortalData: use CharSequence in VenueFriendlyName API
...
Following up on feedback from API council, change the String type
to CharSequence in the get and set Venue friendly name API.
Bug: 179163405
Test: atest ConnectivityServiceTest CtsNetTestCasesLatestSdk:CaptivePortalDataTest
Test: atest NetworkNotificationManagerTest NetworkMonitorTest
Change-Id: Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97
2021-03-19 09:40:34 +00:00
Remi NGUYEN VAN
af56509da2
Merge "Revert "CaptivePortalData: use CharSequence in VenueFriendlyName API"" into sc-dev
2021-03-19 09:38:35 +00:00
Chiachang Wang
7bbc040746
Merge "Send a Network instead of network id for wifi no internet dialog" am: 94dc99ea38 am: 3ff1e2fe49
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766
Change-Id: I1428a4bf9be18601ff70e8fc50e06fecac158a4b
2021-03-19 09:02:20 +00:00
Aaron Huang
330ba163d9
Merge "Remove hidden API usage from ProxyTracker" am: ed15b01b0d am: 2f04604df2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646966
Change-Id: Idd7ae6ad01db35ed2ea47abab183ae423439ede9
2021-03-19 09:02:08 +00:00
Lorenzo Colitti
c3b003da37
Merge "Ensure all calls to getCallingUid use the version in mDeps." am: a6b1b9d110 am: 18e2734d2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635320
Change-Id: Ib427fa0d6d9b2ecf35e820db9eb1dc762a81bb3a
2021-03-19 09:01:55 +00:00
Chiachang Wang
3ff1e2fe49
Merge "Send a Network instead of network id for wifi no internet dialog" am: 94dc99ea38
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644766
Change-Id: I676152104fafb5c4e1b93f0e39fa39e43dd6891c
2021-03-19 08:27:56 +00:00
Aaron Huang
2f04604df2
Merge "Remove hidden API usage from ProxyTracker" am: ed15b01b0d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646966
Change-Id: I2d609875a3a31586626a82dddbfcb015bf5ca0bf
2021-03-19 08:27:14 +00:00
Lorenzo Colitti
18e2734d2f
Merge "Ensure all calls to getCallingUid use the version in mDeps." am: a6b1b9d110
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635320
Change-Id: I6719b51b78ace57bc36f4dba738c0c420947a8bf
2021-03-19 08:24:59 +00:00
Remi NGUYEN VAN
f5bcd32331
Revert "CaptivePortalData: use CharSequence in VenueFriendlyName API"
...
This reverts commit 89aaa0c517 .
Reason for revert: b/183174863
Bug: 183174863
Change-Id: I4db923e112bba149f4e8eb4cfa8c3f97defd5e63
2021-03-19 08:10:35 +00:00
Chiachang Wang
94dc99ea38
Merge "Send a Network instead of network id for wifi no internet dialog"
2021-03-19 07:54:24 +00:00
Aaron Huang
ed15b01b0d
Merge "Remove hidden API usage from ProxyTracker"
2021-03-19 07:50:27 +00:00
Remi NGUYEN VAN
8ffe4eb5e3
Move connectivity AIDLs to android.net
...
java_sdk_libraries and apexes need to contain bootclasspath classes
under predefined packages. Tethering currently uses android.net, so make
sure all the connectivity bootclasspath classes are under android.net.
This avoids maintaining two packages for the tethering APEX, where
com.android.connectivity.aidl is only used by internal AIDL files.
Bug: 182984842
Test: m
Change-Id: I611f1941698c574e37aea912ee76dadc8b32e41a
2021-03-19 07:44:21 +00:00
Lorenzo Colitti
a6b1b9d110
Merge "Ensure all calls to getCallingUid use the version in mDeps."
2021-03-19 07:36:52 +00:00
Chalard Jean
2a98777408
Merge "[NS02] Mix in validation of the score" am: a5323dd580 am: 211f271ce4 am: ff706470e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100
Change-Id: I4a622efe89f7d116751d0243ba29441ef76e997a
2021-03-19 07:27:43 +00:00
Chalard Jean
ff706470e9
Merge "[NS02] Mix in validation of the score" am: a5323dd580 am: 211f271ce4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100
Change-Id: I9f628ce479db20f26a1ea1549ab11635613ccfa9
2021-03-19 06:44:12 +00:00
paulhu
d97c467e2a
Remove unused NetworkPolicyManagerInternal in CS
...
ConnectivityService doesn't call any NPMI methods, so remove all
usage from CS.
Bug: 170598012
Test: atest FrameworksNetTests
Test: atest FrameworksNetIntegrationTests
Change-Id: I8719ef2e96e7db9da2894b467b9e7a1bc09de386
2021-03-19 14:29:01 +08:00
Chalard Jean
211f271ce4
Merge "[NS02] Mix in validation of the score" am: a5323dd580
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100
Change-Id: I229c3033a16d6b7f11f1b3f02351cc0d2153d199
2021-03-19 06:05:28 +00:00
Aaron Huang
d1a8c71ed9
Remove hidden API usage from ProxyTracker
...
Connectivity mainline module cannot use HandlerExecutor because it
is a hidden API. So, replace it with alternative.
Bug: 177035719
Test: FrameworksNetTests
Change-Id: I228a8a2e3479b0af1e977d13f877a565f0789a7e
2021-03-19 06:03:08 +00:00
Remi NGUYEN VAN
2a311db05b
Build framework-connectivity using module_current
...
framework-connectivity needs to build only against stable APIs.
Bug: 171540887
Test: m framework-connectivity.impl
Change-Id: I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c
2021-03-19 06:02:43 +00:00
Chalard Jean
a5323dd580
Merge "[NS02] Mix in validation of the score"
2021-03-19 05:39:40 +00:00
Treehugger Robot
89aaa0c517
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: f678876c62 am: cbb8786faf am: 9f4d989074
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985
Change-Id: I933407d55e33a2cfac44ded44bc58fc0deb9da80
2021-03-19 05:32:21 +00:00
Treehugger Robot
9f4d989074
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: f678876c62 am: cbb8786faf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985
Change-Id: I5c04566c379e2cad164d55050ffdc9152432dfd3
2021-03-19 05:27:46 +00:00
Chalard Jean
67b66080a0
[NS03] Mix in other CS-managed properties
...
These properties are necessary to figure out the maximum
score of a network.
Test: FrameworksNetTests
Change-Id: I48dce20ad4a80597039393dca607e8da829b2a61
2021-03-19 13:50:56 +09:00
Chalard Jean
6bde0e5c04
[NS02] Mix in validation of the score
...
Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I9cac3a05ad0c4008599973b12d2c5e4c02233a5c
2021-03-19 13:50:56 +09:00