Robert Greenwalt
696f60009c
am cc466154: (-s ours) am f59a2ae6: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair am: 15b31036b1
...
Original change: undetermined
Change-Id: Id7a5a63f3cbb7f5a7c1b02cbcd7c0448226120f4
2021-05-31 03:36:01 +00:00
Robert Greenwalt
4a514d5ae4
resolved conflicts for merge of 2a9c1a3e to master am: d1b12bd772
...
Original change: undetermined
Change-Id: Ie956d6682a75270d5e3f94570f630a3b698132df
2021-05-31 03:35:47 +00:00
Doug Zongker
7c1661fc89
resolved conflicts for merge of dd3eff7d to master am: 6e78d3fdc3
...
Original change: undetermined
Change-Id: Ib68076291fa32086d6888f8eaff74cfefd44b0f6
2021-05-31 03:35:34 +00:00
Robert Greenwalt
49b86624f1
Cleanup ConnectivityServices network configuration am: ec05b3cd06
...
Original change: undetermined
Change-Id: I1c377386f2b29b1bb3bbf583c8a1d53bfd8e9f1f
2021-05-31 03:35:21 +00:00
Jean-Baptiste Queru
61d909d02a
merge from open-source master am: 312b4e2421
...
Original change: undetermined
Change-Id: Ie585f2804bd210129bb4253eb628a7fbedd559bb
2021-05-31 03:35:07 +00:00
Robert Greenwalt
38d53d6139
Fix ConnectivityManager permissions check. am: 28f430176a
...
Original change: undetermined
Change-Id: I1b8c2b82adaecbd44779dc5bfe597f850bed39e8
2021-05-31 03:34:54 +00:00
Robert Greenwalt
f7d3a3b809
Turn some logging back on in ConnectionManager am: a25fd71875
...
Original change: undetermined
Change-Id: Ib39c30c2677c33b899fc2dba53c44f6cef8784e6
2021-05-31 03:34:40 +00:00
Dianne Hackborn
4418be6cd8
Work on issue #2163789 : Way too much logging am: 2fdd851867
...
Original change: undetermined
Change-Id: Ib38bfc9c8d88010582c43af449e26fe9c27db279
2021-05-31 03:34:27 +00:00
Robert Greenwalt
ac833c0ac9
Reduce the ConnectivityManager logging. am: 423dbbc68a
...
Original change: undetermined
Change-Id: I32222450ce66d5d0fb990a4335a2eb5771bd4b25
2021-05-31 03:34:13 +00:00
Robert Greenwalt
9ce3a73af9
Fix network-feature timeout code. am: affc3a1c31
...
Original change: undetermined
Change-Id: Ic22893208846d4c02ac569966d3a0e834677b44a
2021-05-31 03:33:59 +00:00
Robert Greenwalt
929773fc51
Report NO_CONNECTIVITY when failover net unavail am: 149d5ac149
...
Original change: undetermined
Change-Id: Ia54fc04024a2fac8a0a183d1bea5c0aa31641ca1
2021-05-31 03:33:45 +00:00
Robert Greenwalt
5fba7f2c5f
Fix for multi-apn MMS access. am: 4666ed0e7e
...
Original change: undetermined
Change-Id: Ic366b1bb17e856833a58147f0d1e5de65cb6b917
2021-05-31 03:33:32 +00:00
Robert Greenwalt
344c7de9bf
Fix the removal of dns entries. am: 8e5b853511
...
Original change: undetermined
Change-Id: I3a87bf69dafe0bc7619e2e93aabff6b35e7a4a64
2021-05-31 03:33:17 +00:00
Robert Greenwalt
1d11dad406
Fix a race condition for data change notification am: f3f045b284
...
Original change: undetermined
Change-Id: I1d8029d3ab2da8172600e057c577f20ab74988e5
2021-05-31 03:33:04 +00:00
Robert Greenwalt
f8fd9efe2e
Fix various issues found when testing Mms. am: a52c75ae24
...
Original change: undetermined
Change-Id: Id044d21392a47807d2f8e6b370d92e4881691261
2021-05-31 03:32:50 +00:00
Mike Lockwood
2fc6836994
ConnectivityService: Do not send broadcasts until the system is ready. am: fde2b76814
...
Original change: undetermined
Change-Id: Icad19bb92bd4f440a88d042ac1f941f1e1fd5b86
2021-05-31 03:32:37 +00:00
Robert Greenwalt
e62ff4f47c
Add net type to mobile for mobile-required traffic am: 2034b91973
...
Original change: undetermined
Change-Id: I146cd13fefa414ff0bc3a9f7239ed6c0743c9a67
2021-05-31 03:32:23 +00:00
Robert Greenwalt
3c09371ed9
Whitespace cleanup prior to real work. am: 0659da31df
...
Original change: undetermined
Change-Id: I4678dd719fdde1dad2b1641384989ad85695bc96
2021-05-31 03:32:09 +00:00
Mike Lockwood
0551cc99e4
wifi: Keep the WLAN network interface up whenever wifi is enabled. am: 1791998080
...
Original change: undetermined
Change-Id: Ibd871009123ac660240032cba00dd9bf4492d3f1
2021-05-31 03:31:55 +00:00
Jean-Baptiste Queru
6bcaae80c7
am 6126eafd: reconcile donut snapshot am: b562ab9015
...
Original change: undetermined
Change-Id: I3778a6aaf82a6148e4177bc4f8f7ad90da9e5c8b
2021-05-31 03:31:41 +00:00
Dianne Hackborn
f27b8ff27d
merged b1d251acd2 am: b771a49a30
...
Original change: undetermined
Change-Id: Ie186657a5477b487aabd11d0afdacb9587f3e4c7
2021-05-31 03:31:27 +00:00
Jean-Baptiste Queru
6f505dc4e2
Merge donut into master am: bc565c0a52
...
Original change: undetermined
Change-Id: I0c40a6646adcdfea180d9382c5e64bfced690c71
2021-05-31 03:31:13 +00:00
Jean-Baptiste Queru
2bd861f4e3
Merge donut into master am: 66b7286230
...
Original change: undetermined
Change-Id: I939a24cc871a6e2fc1182607f544d75efda35974
2021-05-31 03:31:00 +00:00
Automerger Merge Worker
346e03426b
AI 146222: Manual merge of 145980 from donutburger => master. am: 418d2d13d3
...
Original change: undetermined
Change-Id: Ia18da97fc694d78bb7cdc290e8a0f38172e76f0b
2021-05-31 03:30:47 +00:00
The Android Open Source Project
a20c50840e
auto import from //depot/cupcake/@135843 am: 28527d2c5f
...
Original change: undetermined
Change-Id: I7bd463ce7da4cb62b5de171fa318489a34b10e94
2021-05-31 03:30:34 +00:00
The Android Open Source Project
9edcfc70d0
auto import from //depot/cupcake/@135843 am: ae5a5399b4
...
Original change: undetermined
Change-Id: Ib96b88e1beb3924af2030eeedb7156728bd57446
2021-05-31 03:30:20 +00:00
The Android Open Source Project
c5be480b05
auto import from //branches/cupcake/...@130745 am: cffb11385e
...
Original change: undetermined
Change-Id: Ie58d9018ec587c79c3a42152ff45f5e9bf027d1b
2021-05-31 03:29:58 +00:00
The Android Open Source Project
2eb842fa92
Code drop from //branches/cupcake/...@124589 am: 0caef3f9f1
...
Original change: undetermined
Change-Id: I6e0e780979e2d303c4b0e9d30e700d1c98285b7b
2021-05-31 03:29:43 +00:00
The Android Open Source Project
47626abd90
Initial Contribution am: 54a942fddf
...
Original change: undetermined
Change-Id: Ifa8862cbafd96b258d530043afae1488e9dbc111
2021-05-31 03:29:15 +00:00
Orion Hodson
fdbcbb0512
Merge "Use updated NetworkEventDispatcher API" into sc-dev am: 13f6148e22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14722293
Change-Id: I3b13f70d9ec4e2bd97e7ef67f78c7c842af6a92e
2021-05-26 13:55:19 +00:00
Orion Hodson
13f6148e22
Merge "Use updated NetworkEventDispatcher API" into sc-dev
2021-05-26 13:34:07 +00:00
Lorenzo Colitti
ce1dc4feb1
Merge "Update allowed on restricted networks getter/setter" into sc-dev am: 962e174260
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730611
Change-Id: Ida55717388317ce3f7313860e321a8459cf6560d
2021-05-26 12:39:59 +00:00
Lorenzo Colitti
962e174260
Merge "Update allowed on restricted networks getter/setter" into sc-dev
2021-05-26 12:18:03 +00:00
Anton Hansson
4a1e20e353
Include sdk versioning proto in tethering apex am: 89eb55fb8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14683380
Change-Id: I95137d04ae27edad02b7f116a2e46c821b202f87
2021-05-26 10:31:02 +00:00
paulhu
68aacb407a
Update allowed on restricted networks getter/setter
...
As API review feedback, setting allowed on restricted networks
should be by uid instead of package name for security reason.
Thus, update the getter/setter to return/accept set of uids.
Bug: 188085693
Test: atest FrameworksNetTests
Ignore-AOSP-First: Needs cherry-picks
Change-Id: I979bf98075e6c9c0ed7e891582843fddb62643cb
2021-05-26 16:16:57 +08:00
Orion Hodson
1f4fa9ffd5
Use updated NetworkEventDispatcher API
...
Bug: 185153775
Ignore-AOSP-First: addressing API council comments with deadline
Test: m
Change-Id: Iae3cec4f751e1f74ccd26db6f22f55cf21dfc04a
2021-05-25 21:25:17 +01:00
Anton Hansson
89eb55fb8a
Include sdk versioning proto in tethering apex
...
Allows SdkExtensions to inspect its version to decide what the extension
sdk version is on-device.
Bug: 188787081
Test: m com.android.tethering and inspect
Ignore-AOSP-first: internal topic, will cherry-pick after submission
Change-Id: If2d28b02be871594fed1fbb40b7aad284b553afb
2021-05-25 13:01:31 +01:00
Bill Yi
6a9c51da3b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58b943a701 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14707183
Change-Id: I536ce42a36898b24968c8be58968daaa997b6030
2021-05-25 04:08:17 +00:00
Bill Yi
01d8b26118
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I43815f54aac23b9f43bfd427b7b18f22c97e0b31
2021-05-24 18:13:23 -07:00
Bill Yi
58b943a701
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I764f64b9ce1284955530e1c1b40c6441691845e2
2021-05-24 18:12:15 -07:00
Baligh Uddin
395514fa3d
Merge history of packages/Connectivity am: 2afd0986d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14700782
Change-Id: I7507f15a8a7b178035eda8af2345f19baa7267ec
2021-05-24 07:49:35 +00:00
Baligh Uddin
2afd0986d3
Merge history of packages/Connectivity
...
Modified Visibility / Includes for:
- Tethering/common/TetheringLib/Android.bp
Modified License Import for:
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp
Modified Lint mapping for:
- framework/lint-baseline.xml
- service/lint-baseline.xml
BUG: 186628461
TEST: TH
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
2021-05-24 04:40:14 +00:00
TreeHugger Robot
958fe9a51d
Merge changes I1de322c9,Id0983d4b into sc-dev
...
* changes:
Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
Improve IKEv2/IPsec VPN by proposing more IKE algorithms
2021-05-22 05:05:51 +00:00
TreeHugger Robot
424e2ef3aa
Merge "Check location permission for ConnDiags last." into sc-dev
2021-05-22 05:01:18 +00:00
TreeHugger Robot
08bbc34bbe
Merge "Use CS identity to update setting while performing factory reset" into sc-dev
2021-05-22 04:59:28 +00:00
Yan Yan
f1ea9b302c
Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
...
This commit allows IKEv2/IPsec VPN to propose more algorithms that
newly added in IpSecAlgorithm. Those new algorithms have stronger
security guarantees and better performances.
This commit also removes algorithm name validation because all
algorithms are URL encoded to ensure no special characters create
problems due to their use by VpnProfile for list or field delimiting
(e.g. rfc7539esp(chacha20,poly1305))
Bug: 185265778
Test: atest FrameworksNetTests, CtsNetTestCases
Test: All new algorithms are manually verified
Change-Id: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c
Merged-In: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c
2021-05-21 23:33:23 +00:00
Mark Chien
eba760b272
Merge "Test tethered callback with TetheringInterface" into sc-dev am: fcda6f1131
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14622456
Change-Id: I12bc874b2c366ae2256a1a72eec5420f19814a8e
2021-05-21 16:26:30 +00:00
Cody Kesting
0b4be0203d
Check location permission for ConnDiags last.
...
This CL updates ConnectivityService to check location permissions for
ConnectivityDiagnostics callbacks last in the permission check process.
This minimizes misattribution of location access for networks that an
app is not administering.
This CL also updates ConnectivityDiagnosticsManager documentation to
clearly state that location permissions are required in order to receive
callbacks.
Bug: 187310575
Test: atest ConnectivityDiagnosticsManagerTest
Test: atest ConnectivityServiceTest
Change-Id: I2dbeddac6273e2392ccaeae51a1c7776d6d3da75
Merged-In: I2dbeddac6273e2392ccaeae51a1c7776d6d3da75
(cherry picked from commit f3d0fc49db )
2021-05-21 16:22:50 +00:00
Mark Chien
fcda6f1131
Merge "Test tethered callback with TetheringInterface" into sc-dev
2021-05-21 16:04:47 +00:00
Junyu Lai
287890574d
Merge "Add CTS for getAllNetworkStateSnapshots" into sc-dev am: 9a4c06f276
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14598438
Change-Id: I4b36375873be6cfde8b91ce9c0da3cc60478fb74
2021-05-21 09:53:17 +00:00