Treehugger Robot
9eea7b3d09
Merge "Add the related extra information in the javadoc" am: f78aabbf82 am: db0c8c32b1 am: 7663d1760d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465
Change-Id: I9eb3c2543787a91f211be5eb7b92b66fe696489f
2021-04-21 09:19:13 +00:00
Treehugger Robot
03c5476aec
[automerger skipped] Merge "Change Connectivity resources SDK version to 30" am: b15df2fce6 am: 9c4a07f441 am: 05197722a3 -s ours
...
am skip reason: skip tag Change-Id I35c63e4bfe7657afe1e7364926ab139b042b403e with SHA-1 02bc5e3eef is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749
Change-Id: I09477ef4873bab9cb8b319a341502fc7f8fbec0f
2021-04-21 09:18:56 +00:00
Treehugger Robot
7663d1760d
Merge "Add the related extra information in the javadoc" am: f78aabbf82 am: db0c8c32b1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465
Change-Id: Ia2c8d547ec240b828925a98bf2e43291ababebca
2021-04-21 08:53:50 +00:00
Treehugger Robot
05197722a3
Merge "Change Connectivity resources SDK version to 30" am: b15df2fce6 am: 9c4a07f441
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749
Change-Id: I603b13d9a9db97d83591ef8e41fe68c02cb3e96a
2021-04-21 08:53:27 +00:00
Treehugger Robot
db0c8c32b1
Merge "Add the related extra information in the javadoc" am: f78aabbf82
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465
Change-Id: I6ea797209d4d4118ffd28acba4dd419f56d90536
2021-04-21 08:28:23 +00:00
Treehugger Robot
9c4a07f441
Merge "Change Connectivity resources SDK version to 30" am: b15df2fce6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749
Change-Id: I0ef9286794a6013b50fb1dfd0b59d35a5ae55c20
2021-04-21 08:25:39 +00:00
Treehugger Robot
f78aabbf82
Merge "Add the related extra information in the javadoc"
2021-04-21 08:22:43 +00:00
Treehugger Robot
b15df2fce6
Merge "Change Connectivity resources SDK version to 30"
2021-04-21 08:00:41 +00:00
lucaslin
8bee2fd622
Add the related extra information in the javadoc
...
Bug: 185876442
Test: make docs
Change-Id: Ib0abc43e2009dbf5ee7b6c2a076424834d3d53f2
2021-04-21 10:43:15 +08:00
markchien
27bfb8d418
Change Connectivity resources SDK version to 30
...
S tethering module fail to sideload in R platform because package
manager fail to parse S version sdk in R platform.
Bug: 182409819
Test: m
Change-Id: I35c63e4bfe7657afe1e7364926ab139b042b403e
Merged-In: I35c63e4bfe7657afe1e7364926ab139b042b403e
2021-04-20 06:21:04 +00:00
markchien
02bc5e3eef
Change Connectivity resources SDK version to 30
...
S tethering module fail to sideload in R platform because package
manager fail to parse S version sdk in R platform.
Bug: 182409819
Test: m
Change-Id: I35c63e4bfe7657afe1e7364926ab139b042b403e
2021-04-20 14:19:01 +08:00
Aaron Huang
7f852c082d
Merge "Rename getAllNetworkStateSnapshot which should be pluralized" into sc-dev
2021-04-19 16:42:58 +00:00
Aaron Huang
ab615e5c03
Rename getAllNetworkStateSnapshot which should be pluralized
...
Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot
should be pluralized so rename the method to getAllNetworkStateSnapshots
Bug: 183972554
Test: make, FrameworksNetTests
FrameworksServicesTests
Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
2021-04-17 14:08:49 +08:00
Junyu Lai
2d712228b6
[automerger skipped] Merge "[VCN20] Change requestBackgroundNetwork argument order" am: c8499660b2 am: 6c8ddf0c54 am: e03baea556 -s ours
...
am skip reason: skip tag Change-Id Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb with SHA-1 ca657cbca4 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630
Change-Id: Icd3d0fe11a9de3c98d55fb91e935dc537a28af48
2021-04-16 17:16:07 +00:00
Junyu Lai
e03baea556
Merge "[VCN20] Change requestBackgroundNetwork argument order" am: c8499660b2 am: 6c8ddf0c54
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630
Change-Id: I2b4369cb4127f130076ced52ba020db99f617cd7
2021-04-16 16:52:07 +00:00
Junyu Lai
6c8ddf0c54
Merge "[VCN20] Change requestBackgroundNetwork argument order" am: c8499660b2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630
Change-Id: I73df5528088176070af6e54e01358b1edec27b50
2021-04-16 16:25:55 +00:00
Junyu Lai
c8499660b2
Merge "[VCN20] Change requestBackgroundNetwork argument order"
2021-04-16 16:04:31 +00:00
Junyu Lai
05614b419a
Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" into sc-dev
2021-04-16 15:59:16 +00:00
Lorenzo Colitti
5caa63278d
Merge "Don't expose raw IBinder APIs." am: 6f68764bf2 am: c0c07c1b57 am: 15f9321d90
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436
Change-Id: Ic45558c739cfb065e5c9d6fb5ebf485ceb9a630f
2021-04-16 08:48:41 +00:00
Lorenzo Colitti
15f9321d90
Merge "Don't expose raw IBinder APIs." am: 6f68764bf2 am: c0c07c1b57
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436
Change-Id: I42ef2c83eefc6dc4967e71be82f48cca38d74f43
2021-04-16 08:13:03 +00:00
Lorenzo Colitti
c0c07c1b57
Merge "Don't expose raw IBinder APIs." am: 6f68764bf2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436
Change-Id: Ic954df4bcbb444797d62077047cd74182ac06164
2021-04-16 07:42:57 +00:00
Lorenzo Colitti
6f68764bf2
Merge "Don't expose raw IBinder APIs."
2021-04-16 07:22:13 +00:00
Chiachang Wang
dab31a3374
Merge "Extend framework-connectivity.impl visibility" into sc-dev
2021-04-16 01:13:34 +00:00
junyulai
8c8ac36d9a
[VCN20] Change requestBackgroundNetwork argument order
...
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Merged-In: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
Change-Id: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
(cherry-picked from ag/14198667)
2021-04-16 00:16:21 +08:00
Junyu Lai
b1ec3133c3
Merge "[VCN20] Change requestBackgroundNetwork argument order" into sc-dev
2021-04-15 15:57:42 +00:00
Chiachang Wang
f7cd354de5
Merge "Remove hidden method link in public addRoute API" am: fe09ad78cd am: 79edf2d346 am: 01d4caea3c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435
Change-Id: I80ed5448b854960cea0ae58c93491990d54ffd86
2021-04-15 13:16:16 +00:00
Chiachang Wang
01d4caea3c
Merge "Remove hidden method link in public addRoute API" am: fe09ad78cd am: 79edf2d346
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435
Change-Id: I3477f3a78ebee26d950ce6c6eaf45cdef8a5ee6d
2021-04-15 12:46:41 +00:00
Chiachang Wang
79edf2d346
Merge "Remove hidden method link in public addRoute API" am: fe09ad78cd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435
Change-Id: Ide004783057673561ea631e0a59ce4c01c2841af
2021-04-15 11:53:02 +00:00
TreeHugger Robot
a39ee08b57
Merge "Add documentation" into sc-dev
2021-04-15 10:52:46 +00:00
junyulai
ca657cbca4
[VCN20] Change requestBackgroundNetwork argument order
...
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Ignore-AOSP-First: avoid build break caused by multipatch automerge
Change-Id: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
2021-04-15 18:43:48 +08:00
junyulai
9605391498
[VCN19] Rename get/setSubIds to get/setSubscriptionIds
...
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215036
Ignore-AOSP-First: avoid merge conflict
Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
2021-04-15 18:05:38 +08:00
Lorenzo Colitti
12bcbe5efa
Don't expose raw IBinder APIs.
...
APIs should not expose raw IBinder objects.
Fix: 184735751
Test: builds, boots
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Change-Id: Ia0c4170def31123f0b79318fec2cfe02e4fcd3bf
2021-04-15 18:47:21 +09:00
Chalard Jean
3c824eca72
Add documentation
...
Bug: 185121472
Test: doc-only change
Change-Id: I5fd68b209959043f6fe15ac34629c51233fea596
2021-04-15 18:07:56 +09:00
Chiachang Wang
7ceeabe0da
Remove hidden method link in public addRoute API
...
The build will complain after moving connectivity framework code
outside framework because the hidden methods/members accesses are
not allowed anymore. Link to a hidden class will not work since
it's not visible in public.
Bug: 182859030
Test: make docs
Change-Id: I5726f80be7cf92b648ce851d9601d5f58bc2b647
2021-04-15 16:21:00 +08:00
Chiachang Wang
3270871367
Extend framework-connectivity.impl visibility
...
Allow netlegacy22.api to use hidden connectivity methods.
Bug: 182859030
Test: m
Change-Id: I92936afb9fb533ea3b426490eb9617389f99fc8b
2021-04-15 13:06:39 +08:00
Chalard Jean
85e65c8fc1
Allow network providers to set the linger duration.
...
Test: atest CtsNetTestCases:NetworkAgentTest#testSetLingerDuration
Ignore-AOSP-First: prevent merge conflict
CTS-Coverage-Bug: 184796264
Bug: 184227264
Change-Id: I7f420faa40863385114705d6971cf00887d03318
2021-04-14 20:26:12 +08:00
Lorenzo Colitti
f40b20ec1c
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: 7dc61be0da am: b09793ab41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568
Change-Id: I1193382337088113bf64a636b0b70429d28f8be6
2021-04-14 03:00:32 +00:00
Lorenzo Colitti
b09793ab41
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: 7dc61be0da
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568
Change-Id: I3c13a27c78cb824d366095edbf37d30527978def
2021-04-14 02:33:11 +00:00
Lorenzo Colitti
7dc61be0da
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568
Change-Id: I4febfa2d96c678decff23eb08e40ba0e33e4c7bf
2021-04-14 01:24:19 +00:00
Lorenzo Colitti
a34d4892a4
Add @RedactionType annotations to VpnTransportInfo.
...
This is in response to API council feedback.
Test: m
Bug: 185226718
Change-Id: I63d7249e7d14ac00558f311a3583f6adbf80e3d9
2021-04-14 00:28:19 +09:00
Pedro Loureiro
386aeaa3d9
Merge "Add lint baseline to address NewApi errors" into sc-dev
2021-04-13 14:12:41 +00:00
Chiachang Wang
229de02f5b
Merge "Extend framework-connectivity.impl visibility to more test" into sc-dev
2021-04-13 13:27:45 +00:00
Chiachang Wang
bb996c3b1d
Merge "Make getUid a method on UserHandle itself instead of static" am: 9500ca6b5f am: e2a6a92c30 am: c3f73bd1ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: Ic0b7887630c00404ff354c193b82a96930940556
2021-04-13 13:06:43 +00:00
Chiachang Wang
c3f73bd1ac
Merge "Make getUid a method on UserHandle itself instead of static" am: 9500ca6b5f am: e2a6a92c30
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d
2021-04-13 11:54:57 +00:00
Pedro Loureiro
57bc16e08a
Add lint baseline to address NewApi errors
...
We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.
Bug: 150847901
Test: m lint-check
Change-Id: Ide8a8fe80ba31396f23853ab266afcbcc33af9a6
2021-04-13 10:51:51 +01:00
Chiachang Wang
e2a6a92c30
Merge "Make getUid a method on UserHandle itself instead of static" am: 9500ca6b5f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185
Change-Id: If47dccc346aa78c7cb49aafbd5e07d35d3403c6a
2021-04-13 08:51:12 +00:00
Chiachang Wang
9500ca6b5f
Merge "Make getUid a method on UserHandle itself instead of static"
2021-04-13 08:15:47 +00:00
Chiachang Wang
426a6de6b3
Extend framework-connectivity.impl visibility to more test
...
Allow captive portal tests to use hidden connectivity methods.
Bug: 182859030
Test: m
Change-Id: I2c51cbefa6d56c7ec53bacfffe735fa9d14c6510
2021-04-13 12:53:06 +08:00
Chiachang Wang
e2239bc4b2
Merge "Rename APIs in NetworkAgentConfig.Builder" am: f212a922e9 am: 3786083176 am: d811a2671d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047
Change-Id: I1988750dd4b65a3d74c33c8fc120bb3bcb705320
2021-04-12 15:14:26 +00:00
Paul Hu
f63d85dc00
Merge "Remove TcpRepairWindow from module-lib API" am: b82fad9aa9 am: a69d2280fc am: 89edca00d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671788
Change-Id: I1d472c9cffaa0c7f35b284b97fa374b03232a7f4
2021-04-12 15:13:48 +00:00