Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
566,104 Commits 3 Branches 0 Tags
abed1c46be29501ca1fc367ffc0fe278ebc99f8a
Commit Graph

566104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
abed1c46be Merge "Make isDataCapable a public API" am: 965d021bf5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629275

Change-Id: I62af3d279b584ea6aba4079703b18d511042b3e0
 2021-03-22 12:04:16 +00:00
Jack Nudelman
75c0c02fd4 Merge "Add capability for thermal mitigation." am: 1cc1558ea6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621704

Change-Id: I6a69da053ea9a413d779e9c7f4d8c7eed96dace1
 2021-03-22 12:01:29 +00:00
Treehugger Robot
965d021bf5 Merge "Make isDataCapable a public API" 2021-03-22 12:00:20 +00:00
Jack Nudelman
1cc1558ea6 Merge "Add capability for thermal mitigation." 2021-03-22 11:38:10 +00:00
Lorenzo Colitti
3042783816 Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972

Change-Id: I1c3de9d738a294e9d21314de84384fa89745285d
 2021-03-22 10:17:37 +00:00
Lorenzo Colitti
7a2f9c06ca Merge changes I90bf7957,If58524b0 
* changes:
  Fix privileged apps calling registerDefaultNetworkCallback.
  Test a bug with NETWORK_SETTINGS+registerDefaultNetworkCallback.
 2021-03-22 09:43:53 +00:00
Chiachang Wang
0e1deb1520 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 9f1cd40748 -s ours 
am skip reason: skipped by user chiachangwang

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

Change-Id: Ib56fafd17dc88b9ded6cd39501a3bfa4cf5fe1b5
 2021-03-22 07:17:25 +00:00
Treehugger Robot
64169ae2a1 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: efbd8b3961 -s ours 
am skip reason: skipped by user chiachangwang

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

Change-Id: Ib61e9100ff497a22a900aa13a83027242ddddecb
 2021-03-22 06:55:09 +00:00
Chiachang Wang
9f1cd40748 Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" 2021-03-22 06:26:33 +00:00
Chiachang Wang
44c49e6c4e Revert "Correct the logic in NetworkCapabilitiesTest" 
This reverts commit f08d3d4359.

Reason for revert: <Merge abnormal in automerger>

Change-Id: I0cdb401f4962050bf24dc9d9871d4ef15cf52629
 2021-03-22 06:15:02 +00:00
Remi NGUYEN VAN
f0ae748bf5 Merge "Remove Preconditions usage in TestNetworkSpecifier" am: 1077770f78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644991

Change-Id: Ifca29ba189f58655b0229467e2d86b0b6426b2d1
 2021-03-22 03:32:31 +00:00
Remi NGUYEN VAN
e3a7e8d8a5 Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: 9cb39acfef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635319

Change-Id: I0a933c31e05428526a5c6fb4ef694f7c4cf818bb
 2021-03-22 03:29:41 +00:00
Remi NGUYEN VAN
9329f9fe97 Merge "Add TEST_MAPPING for Connectivity" am: 2ff7a8e1b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646851

Change-Id: I829c839620849e3a49be0f2629157f4adb9a1dcb
 2021-03-22 03:26:46 +00:00
Treehugger Robot
4e688a6cb7 Merge "Move trimV4AddrZeros to libs/net" am: 405801f0fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636022

Change-Id: Ifbad5630a39f8990479a5f20e018a3a499334fe1
 2021-03-22 03:23:48 +00:00
Remi NGUYEN VAN
bd85dbeb41 Merge "Add SystemMessages protos to Connectivity" am: 805b39b2d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626204

Change-Id: I8648b09a97485dcecac2e5075d605e79a730ec3f
 2021-03-22 03:20:45 +00:00
Jayachandran Chinnakkannu
cd9b3e06c2 Merge "Swap parameters in QosCallback#registerQosCallback" am: bc71009366 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628901

Change-Id: I2c371b6f1dc25f84a389480e46d9d582e9da148b
 2021-03-22 03:18:17 +00:00
Treehugger Robot
6ec4bd694b Merge "Add new @SystemApi for specifying AddressType and IRK" am: bf516b9e11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641559

Change-Id: I616502ee58d95cbc20fd38b395f7f0e294b5713e
 2021-03-22 03:15:47 +00:00
SongFerng Wang
3dd9c6bf01 Merge "The phone didn't reload the allowed Network Type" am: cfa02cd687 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641903

Change-Id: I31b5181911e901d0fa2f4d90772be4088b3754d6
 2021-03-22 03:12:25 +00:00
Treehugger Robot
efbd8b3961 Merge "Correct the logic in NetworkCapabilitiesTest" 2021-03-22 02:20:19 +00:00
Remi NGUYEN VAN
1077770f78 Merge "Remove Preconditions usage in TestNetworkSpecifier" 2021-03-22 01:40:44 +00:00
Remi NGUYEN VAN
9cb39acfef Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" 2021-03-22 01:40:28 +00:00
Remi NGUYEN VAN
2ff7a8e1b3 Merge "Add TEST_MAPPING for Connectivity" 2021-03-22 01:39:51 +00:00
Treehugger Robot
405801f0fc Merge "Move trimV4AddrZeros to libs/net" 2021-03-22 01:37:06 +00:00
Remi NGUYEN VAN
335a968b65 Remove Preconditions usage in TestNetworkSpecifier 
Preconditions is a hidden API utility. It can be easily replace by
inline checks.

Bug: 177046265
Test: m
Change-Id: I3f722075fb9c74e12e40348ba4faad2f0fa67178
Merged-In: I3f722075fb9c74e12e40348ba4faad2f0fa67178
 2021-03-22 00:02:10 +00:00
Remi NGUYEN VAN
496d5dca27 Revert "Revert "Remove connectivity dependency on Preconditions"" 
Preconditions.checkNotNull is deprecated to be replaced by
Objects.requireNonNull, and other methods can easily be replaced by
inline checks.

Preconditions is an internal API class that should not be used by
unbundled jars.

Bug: 177046265
Change-Id: I3a67d266b32142c034520acbcdc30f7213db5e13
Merged-In: I3a67d266b32142c034520acbcdc30f7213db5e13
Test: m
 2021-03-22 00:01:43 +00:00
Remi NGUYEN VAN
805b39b2d9 Merge "Add SystemMessages protos to Connectivity" 2021-03-21 23:58:00 +00:00
Jayachandran Chinnakkannu
bc71009366 Merge "Swap parameters in QosCallback#registerQosCallback" 2021-03-21 21:02:36 +00:00
Treehugger Robot
bf516b9e11 Merge "Add new @SystemApi for specifying AddressType and IRK" 2021-03-21 20:15:38 +00:00
Roshan Pius
fdc5eb6e56 resolve merge conflicts of 403b7fd0b0 to stage-aosp-master 
Merged-In: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
Change-Id: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
 2021-03-21 19:20:35 +00:00
Lorenzo Colitti
ae67988721 Fix privileged apps calling registerDefaultNetworkCallback. 
When registerDefaultNetworkCallback is called by an app that has
NETWORK_SETTINGS, the UID of the app is forgotten and the request
that is filed has an empty UID set. This results in that request
matching networks that have UID ranges that do not include it,
e.g., VPNs.

Fix this by ensuring that the UID ranges are properly set.

Bug: 165835257
Test: updated specific tests for this bug
Change-Id: I90bf79573342c144d1cfbc2f61a3155fdd5b1fa7
 2021-03-22 02:29:29 +09:00
Lorenzo Colitti
d22c7588d7 Test a bug with NETWORK_SETTINGS+registerDefaultNetworkCallback. 
Currently, if a process with NETWORK_SETTINGS registers a default
network callback, its uid will be ignored and replaced with an
empty list of UIDs. This means it will incorrectly match VPNs
with any UID range.

Add a test for this bug to make it easier to review the upcoming
change that fixes it.

Bug: 165835257
Test: test-only change
Change-Id: If58524b01fdd60045fb7236d17dedf31fb563f99
 2021-03-22 02:29:29 +09:00
Chiachang Wang
964605dc23 [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: b0c6107723 -s ours 
am skip reason: skip tag Change-Id I107c329d4d7130d488772166eae8b5e7aaa2ff04 with SHA-1 11403c6b1b is already in history

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

Change-Id: I1773af223afb67d522cc05d3658608505340023e
 2021-03-21 16:55:29 +00:00
Lorenzo Colitti
b8acfc2327 Merge changes from topic "backport-connectivityresources" am: 744e27a39e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645297

Change-Id: Id6e8f89870b70332212e9052168e6f7c2faa3ee3
 2021-03-21 16:51:02 +00:00
Lorenzo Colitti
127c8b8336 Cherry-pick some test changes from ag/13210542. am: 250710c687 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645000

Change-Id: Iebfee24a963aac516bf44ef70128ffdaeec25a45
 2021-03-21 16:48:06 +00:00
SongFerng Wang
cfa02cd687 Merge "The phone didn't reload the allowed Network Type" 2021-03-21 16:45:59 +00:00
Remi NGUYEN VAN
86fd14bae2 Add connectivity protos to framework-connectivity am: 3b0736735b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635040

Change-Id: Idebb84324407d0ce2f0066888b14fc22df736515
 2021-03-21 16:45:11 +00:00
paulhu
f994ab199c Remove unused NetworkPolicyManagerInternal in CS am: 279b33817f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646969

Change-Id: I5a838b1017d1648e67576bfd7940ea9161b2c764
 2021-03-21 16:43:40 +00:00
Remi NGUYEN VAN
7848a89499 Move connectivity AIDLs to android.net am: 3a680dc897 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596272

Change-Id: If61c15ea55ec2081eab7fd2368e77f16ef51c769
 2021-03-21 16:41:38 +00:00
Treehugger Robot
403b7fd0b0 Merge changes from topics "revert-1645768-revert-1626206-replaceUidRange-MSYTKFNGUE-HIUTVTIGIR", "ti_redaction" 
* changes:
  TransportInfo: Add a generic redaction mechanism
  Revert "Revert "Expose uids related APIs in NetworkRequest and N..."
  Revert^2 "Replace the usage of UidRange"
 2021-03-21 16:41:13 +00:00
Remi NGUYEN VAN
2c1e6d836c Migrate framework-connectivity internal resources am: 4f8084867e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641905

Change-Id: I21a5632d566b2ef883c48f60b420fb76d04a3e05
 2021-03-21 16:38:40 +00:00
Lorenzo Colitti
6a4ff66e39 Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks am: f969377a96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644390

Change-Id: If8a984d3bc2dbfb2d326079d5015c4bdc4edb8f7
 2021-03-21 16:38:04 +00:00
Remi NGUYEN VAN
19efae9ff9 Add multipath preference, background status API am: 00b8d2cf37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644388

Change-Id: I4c1a53223c4cce7759b2cc3efb74a6568abcde57
 2021-03-21 16:37:02 +00:00
Lorenzo Colitti
744e27a39e Merge changes from topic "backport-connectivityresources" 
* changes:
  Use module resources in NetworkNotificationManager.
  Cherry-pick some test changes from ag/13210542.
  Add connectivity protos to framework-connectivity
  Remove unused NetworkPolicyManagerInternal in CS
  Move connectivity AIDLs to android.net
  Migrate framework-connectivity internal resources
  Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks
  Add multipath preference, background status API
 2021-03-21 15:47:28 +00:00
Hui Wang
e6cbb031cd Merge "Add VoPS support info for NR" am: 98763306a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585530

Change-Id: If4f0593db67b8a98a78b73fba67e0383d1bc7a31
 2021-03-21 04:42:56 +00:00
Hui Wang
98763306a2 Merge "Add VoPS support info for NR" 2021-03-21 04:12:52 +00:00
Martin Brabham
045fe260e1 Add new @SystemApi for specifying AddressType and IRK 
Bug: 178234318
Test: compiles and runs
Tag: #feature
Change-Id: Ib67e681af01260df98602003b2aca47963494c6f
 2021-03-20 15:13:24 -07:00
Lorenzo Colitti
250710c687 Cherry-pick some test changes from ag/13210542. 
ag/13210542 switched from using reset() on mResources to using
clearInvocations(). This ensures that only the previous calls are
reset, and that the mock continues to behave according to what
was specified in setUp.

Test: 183097033
Test: test-only change
Merged-In: I35d28c8df341dbbac2774026c6ca749e296c0482
Change-Id: Ieef982d2df50db3014f35f58a77674939ebe0d43
 2021-03-21 01:54:51 +09:00
Lorenzo Colitti
8b77bf790c Use module resources in NetworkNotificationManager. 
Also make getTransportName non-static so it can access the module
resources.

Also fix a duplicate comment in a resource file.

Bug: 183097033
Test: atest FrameworksNetTests
Test: connected to Wi-Fi with no Internet, observed notification
Change-Id: Ic0d24d36af0b87153d527083f8964ddc6cd78482
Merged-In: Ic0d24d36af0b87153d527083f8964ddc6cd78482
 2021-03-21 01:54:51 +09:00
Lorenzo Colitti
d4aaa768f5 Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4cc71277cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644996

Change-Id: I97d371fc7c299828c34d1d60965e9f4959e685a3
 2021-03-20 14:30:22 +00:00
Lorenzo Colitti
4cc71277cd Merge "Copy NetworkNotificationManager resources to conectivity module." 2021-03-20 13:52:46 +00:00