Commit Graph

14948 Commits

Author SHA1 Message Date
Paul Hu
8ee4d96282 Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor
Let PermissionMonitor read APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting and grant netd system permission to uids whose package
name is listed in setting.

Bug: 185149952
Test: atest FrameworksNetTests
Merged-In: I856b545c0339a262abbe9d432cfda125bc82dc12
(clean cherry-pick)

Change-Id: I856b545c0339a262abbe9d432cfda125bc82dc12
2021-05-18 14:16:57 +00:00
Chiachang Wang
ad4e3bbd5b Merge "Dump only NORMAL priority information if no priority assigned" into sc-dev 2021-05-18 11:57:53 +00:00
Lorenzo Colitti
d82c1ec110 Allow unprivileged NetworkCallbacks to see other UIDs' networks.
Currently, unprivileged apps can call getAllNetworks() to see
all networks on the system, even networks that do not apply to
them. Allow them to do this via NetworkCallbacks as well.

This is the last piece of information that was only available
through getAllNetworks, so this CL deprecates that API.

Bug: 187921303
Test: new unit tests
Test: CTS test in other CL in topic
Change-Id: I30f1021927d3c8eae6525116c61ff4a4acecff6d
2021-05-18 12:24:07 +09:00
Chiachang Wang
dc8fdde331 Dump only NORMAL priority information if no priority assigned
The legacy design of "dumpsys connectivity" will only dump
information with NORMAL priority. It was updated to provide
both NORMAL and HIGH priority information in order to support
dump in bugreport. However, it will also affect the result
using dumpsys connectivity.

Update design to dump NORMAL priority only to align with legacy
design.

Bug: 188387185
Test: adb shell dumpsys connectivity
Test: adb bugreport and check the result in bugreport
Change-Id: I6825c5038e48e3060c0c3ad1512bd584ef6d10a7
Merged-In: I6825c5038e48e3060c0c3ad1512bd584ef6d10a7
2021-05-18 02:13:42 +00:00
Aaron Huang
3610ac6ad1 Merge "Add ConnectivityAnnotations class" into sc-dev 2021-05-17 14:07:45 +00:00
Jayachandran Chinnakkannu
2e83d431f0 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7 am: cea0264ef0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I04ada71bdea2c3851fd6925126f6ff2bfdecad2c
2021-05-14 21:19:17 +00:00
Jayachandran Chinnakkannu
cea0264ef0 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I6f1d972f822b022995cfdc99942f1167a4f8ef0d
2021-05-14 20:53:05 +00:00
Jayachandran Chinnakkannu
61736254b7 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: Ibd70a86d82d4810425288694f2e3904d471a2d24
2021-05-14 20:28:38 +00:00
Jayachandran Chinnakkannu
fd92919d9d Merge "QOS filter matching support based on remote address and port number for connected sockets" 2021-05-14 20:02:30 +00:00
Junyu Lai
1bdbacd83c Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e am: ee455cedce am: 35039336a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845

Change-Id: I8c62d218953027ee2fb5426ddacae5a6f8bb6c73
2021-05-14 12:20:10 +00:00
Junyu Lai
35039336a6 Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e am: ee455cedce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845

Change-Id: If6b9da9ce754f33868305075013b0f82ff64fedb
2021-05-14 12:03:29 +00:00
Junyu Lai
ee455cedce Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845

Change-Id: Idde0e161d6241a5c45c0b751e1fca912ed10c7a8
2021-05-14 11:48:14 +00:00
Junyu Lai
819b9a637e Merge "[FUI26] Address comments on aosp/1560408" 2021-05-14 11:34:09 +00:00
Paul Hu
a99d1226d2 Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 38d6905614 am: d0c08e3cd8 am: 0cc57b5c0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327

Change-Id: Ia8e395132226d23fdfb8cd4c93c004c459386104
2021-05-14 11:00:38 +00:00
Paul Hu
0cc57b5c0b Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 38d6905614 am: d0c08e3cd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327

Change-Id: Iedd6429e956f77ba595f5dd6029c48a487ddbf0c
2021-05-14 10:41:33 +00:00
TreeHugger Robot
6c7d52f93c Merge "Move connectivity test defaults to tests/common" into sc-dev 2021-05-14 10:40:28 +00:00
Paul Hu
d0c08e3cd8 Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: 38d6905614
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327

Change-Id: I0c9966c379e956fbf8a01d81d5f1dd0e68662763
2021-05-14 10:25:37 +00:00
Aaron Huang
319b0be3ed [automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: 666aa69090 am: 902c1df2d7 am: c2d39cdac4 -s ours
am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 aa601c3bf1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I39709941a1770435d9a2e221025b46eed5d32ea0
2021-05-14 10:07:18 +00:00
Treehugger Robot
5c752b5aca Merge "Reference unreachable netId from INetd" am: 7c26f06ea1 am: 99054d066c am: 52dcdaf9ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: Ia8db25ba86450341d4b9278eba350014fa3b880c
2021-05-14 10:06:00 +00:00
Paul Hu
38d6905614 Merge "Address [set|get]RestrictedAllowedApps API review feedback" 2021-05-14 10:00:39 +00:00
TreeHugger Robot
4aa5b97ccb Merge "Address comments on ag/14486203" into sc-dev 2021-05-14 09:59:43 +00:00
Aaron Huang
c2d39cdac4 Merge "Rename *Iface* APIs to *Interface*" am: 666aa69090 am: 902c1df2d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I9aa62677f52ac78916c518d1378a05bda143f676
2021-05-14 09:44:33 +00:00
Aaron Huang
902c1df2d7 Merge "Rename *Iface* APIs to *Interface*" am: 666aa69090
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693585

Change-Id: I62fa0403c8b2d78e7e7a90be8ac804576ec27456
2021-05-14 09:36:36 +00:00
Treehugger Robot
52dcdaf9ea Merge "Reference unreachable netId from INetd" am: 7c26f06ea1 am: 99054d066c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: I2f14897dda29c6ea4469952e56a0fa0e1c8a9a8f
2021-05-14 09:36:35 +00:00
Chiachang Wang
cc142fec4c Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev 2021-05-14 09:32:42 +00:00
Aaron Huang
666aa69090 Merge "Rename *Iface* APIs to *Interface*" 2021-05-14 09:11:29 +00:00
Treehugger Robot
99054d066c Merge "Reference unreachable netId from INetd" am: 7c26f06ea1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: Iedbf9e9b150c95aa0da6a7b20af0dd1412703e2b
2021-05-14 08:39:18 +00:00
Chalard Jean
8e27d76e43 Address comments on ag/14486203
Bug: 186458024
Test: comment-only change
Change-Id: I7b086abbb57354086e8fb1a41c63140f2227173f
2021-05-14 17:31:30 +09:00
Chalard Jean
bdcc8678a1 Merge "Make yield-to-bad-wifi behavior backward compatible with R" into sc-dev 2021-05-14 08:21:27 +00:00
Treehugger Robot
7c26f06ea1 Merge "Reference unreachable netId from INetd" 2021-05-14 08:08:08 +00:00
junyulai
bad30368d4 [FUI26] Address comments on aosp/1560408
Test: TH
Bug: 174123988
Change-Id: I949eeb8903e903d8ede90521442b1f917d5cdfeb
2021-05-14 15:57:44 +08:00
paulhu
65de9957a1 Address [set|get]RestrictedAllowedApps API review feedback
- Rename [set|get]RestrictedAllowedApps to
  [set|get]AppsAllowedOnRestrictedNetworks
- Remove the regex of validate package name check

Bug: 188085693
Test: m update-api && m
Change-Id: I07966fb66093523a67e1e6a1ecfa05cc399e22f2
2021-05-14 15:27:36 +08:00
Remi NGUYEN VAN
b31719df76 [automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: b6084988b7 am: e2c64094eb -s ours
am skip reason: Merged-In I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4 with SHA-1 a146cf1de6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549

Change-Id: I15d4f795062ca5f44b9291e14c96e7fa6890e98a
2021-05-14 07:26:47 +00:00
Treehugger Robot
5575ee1b0e [automerger skipped] Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: 0d6abb4b42 am: 1564e81540 -s ours
am skip reason: Merged-In I26d1a274058fa38763ad4f605549d880865b4d76 with SHA-1 c0b5ead56d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706845

Change-Id: Idf91bcf36f6e79ab7f5c91d9939a3b7f742d73dd
2021-05-14 07:26:24 +00:00
Remi NGUYEN VAN
8336e0becc Move connectivity test defaults to tests/common
The build file currently holds a single build rule in test/. Move it to
the existing build file in tests/common/Android.bp.

Test: m
Bug: 186628461
Change-Id: I3948c9b46e2647f945a22f16aad493e94fe50b4d
2021-05-14 07:24:53 +00:00
Remi NGUYEN VAN
e2c64094eb Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: b6084988b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549

Change-Id: I486b0d2759200a5a1bb9679577f5d97ea43c252b
2021-05-14 07:08:58 +00:00
Treehugger Robot
1564e81540 Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: 0d6abb4b42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706845

Change-Id: Ia2b0715ed1f144216c1f64069757bf717a3f083f
2021-05-14 07:08:44 +00:00
Chiachang Wang
c5c3bfb20e Replace clearAll with withoutDefaultCapabilities
As the feedback from API review, the clearAll method in Builder
does not match the actual usage. Thus, remove it and replace
with withoutDefaultCapabilities to provide clearer usage.

Bug: 184735772
Test: make update-api ; m
Change-Id: Ida8d25d57504864f046e3403f593cc606fbfe982
CTS-Coverage-Bug: 186061922
2021-05-14 14:53:47 +08:00
Remi NGUYEN VAN
b6084988b7 Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549

Change-Id: Ib8967ac75b038202430a74276a632b37973ed92b
2021-05-14 06:47:49 +00:00
Treehugger Robot
0d6abb4b42 Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706845

Change-Id: Id619f74f84699c8f63edad37beb63537b7c06b3d
2021-05-14 06:41:07 +00:00
Ken Chen
69ed8430fa Reference unreachable netId from INetd
Bug: 181579204
Test: m; atest FrameworksNetTests
Change-Id: Id0d30363abe583459a8022e7400aab1dd4f72939
2021-05-14 14:30:43 +08:00
Chalard Jean
372a4f3eec Make yield-to-bad-wifi behavior backward compatible with R
Yielding cell wins to exiting wifi (whether good or bad).
It loses to bad wifi that's not exiting.

In R, yielding to bad wifi only affects wifis that are
unvalidated, but a wifi that is exiting should still be
dropped in favor of a cell that yields to bad wifi.

I had misunderstood the policy and implemented it wrong.
Now it's implemented right, and has careful tests.

Test: new tests for this
Bug: 186458024
Change-Id: Ib8637100d491e72a2edb837584ce55b7dda58524
2021-05-14 15:27:12 +09:00
Aaron Huang
8dd94bdcef Rename *Iface* APIs to *Interface*
Address API review feedback, other APIs have been refering to
these as "interface" instead of "iface" so migrate the APIs named
*Iface* to *Interface*.

(cherry-picked from ag/14326779)
Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Merged-In: I38b476e762fb57fa88c4a789092d0af6f5330d80
Change-Id: I38b476e762fb57fa88c4a789092d0af6f5330d80
2021-05-14 11:05:22 +08:00
Aaron Huang
9ca37f599b Add ConnectivityAnnotations class
This change is to address API review, add respective
@IntDef for network policy API.

Typedef cannot be exposed as SystemApi so add
ConnectivityAnnotations class and add an annotation library
so that it can be used in module and platform.

Bug: 183972925
Test: m, build doc target framework-doc-stubs_annotations.zip
      and check the APIs have an attribute IntDef annotation
Change-Id: Ie3ec40cf48818edd422a4550377774eae387d3b2
2021-05-14 10:30:49 +08:00
Ken Chen
f590efa713 [automerger skipped] Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3feeafcb4a am: b7130a2c65 am: d348117f40 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705391

Change-Id: I981f62347bf962ce71eeec2e2bdb7b2c25480a30
2021-05-13 19:11:57 +00:00
Ken Chen
15b83033f3 [automerger skipped] [DO NOT MERGE] Revert "Reference unreachable netId from INetd" am: d901acbdfb am: b9c8676b67 am: 67f453b86e -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705391

Change-Id: I2d1439da5a0f0b527c424982c442e05354a35814
2021-05-13 19:11:46 +00:00
Ken Chen
d348117f40 Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3feeafcb4a am: b7130a2c65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705391

Change-Id: I1aeb8e966cc95ea4734a57855507c1b5534b1e1f
2021-05-13 19:01:39 +00:00
Ken Chen
67f453b86e [DO NOT MERGE] Revert "Reference unreachable netId from INetd" am: d901acbdfb am: b9c8676b67
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705391

Change-Id: I95422a1f422a6cff29f92eeb2506e9d9ac90c98f
2021-05-13 19:01:36 +00:00
Ken Chen
b7130a2c65 Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd"" am: 3feeafcb4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705391

Change-Id: I1662004b925d40bd84851ddef1d63654307e7862
2021-05-13 18:43:27 +00:00
Ken Chen
b9c8676b67 [DO NOT MERGE] Revert "Reference unreachable netId from INetd" am: d901acbdfb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705391

Change-Id: I9735b2c50de8899ca7c856ee02ade2fa3ec1a357
2021-05-13 18:41:12 +00:00