Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
567,986 Commits 3 Branches 0 Tags
67a4e2b457f8a5931099073782cfa305fef8bf70
Commit Graph

567986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
67a4e2b457 [automerger skipped] Replace the usage of UidRange am: 142408a46f -s ours 
am skip reason: skip tag Change-Id Idb7f353788c5779a4fbbd107595e9326b99fe0a8 with SHA-1 f8c3e2eb4e is already in history

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

Change-Id: I3e7a0c612ee4ca37bf5567d5ec1297cf14671337
 2021-03-22 19:12:32 +00:00
Chiachang Wang
02ed58ad24 Expose uids related APIs in NetworkRequest and NetworkCapabilities 
NetworkRequest is moving into the incoming connectivity mainline
module. The hidden setUids becomes inaccessible outside the
module. Shims for support cts in different API levels will need
to use it to verify the behavior of NetworkRequest. Thus, expose
it to the API surface.

Also, VPN uses getUids and setUids to control network
capabilities. Networkcapabilities is a part of incoming
connectivity mainline module but VPN is not. Thus, exposing these
two methods are needed to allow VPN to continue using it.

Test: make update-api
Bug: 172183305
Merged-In: I107c329d4d7130d488772166eae8b5e7aaa2ff04
Change-Id: If76877e6bde7abe3b5ddde078f87eefd027e675c
 2021-03-23 01:33:16 +09:00
Chiachang Wang
142408a46f Replace the usage of UidRange 
UidRange is used in a shared way between ConnectivityService
and VPN through the use of NetworkCapabilities. UidRange will
be part of the ConnectivityService mainline but Vpn.java will
stay in the framework. We need a way to replace the APIs using
UidRange, or to make UidRange system API. The only really
relevant surface here is NetworkCapabilities#{setUids, getUids}.
The need for UidRange could be replaced by an integer Range, so
replace the usage of UidRange by a integer Range in
NetworkCapabilities#{setUids, getUids} and update the relevant
callers.

Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9
Merged-In: Idb7f353788c5779a4fbbd107595e9326b99fe0a8
Change-Id: Idb7f353788c5779a4fbbd107595e9326b99fe0a8
 2021-03-23 01:11:20 +09:00
Chiachang Wang
f8c3e2eb4e Replace the usage of UidRange 
UidRange is used in a shared way between ConnectivityService
and VPN through the use of NetworkCapabilities. UidRange will
be part of the ConnectivityService mainline but Vpn.java will
stay in the framework. We need a way to replace the APIs using
UidRange, or to make UidRange system API. The only really
relevant surface here is NetworkCapabilities#{setUids, getUids}.
The need for UidRange could be replaced by an integer Range, so
replace the usage of UidRange by a integer Range in
NetworkCapabilities#{setUids, getUids} and update the relevant
callers.

Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9
Change-Id: Idb7f353788c5779a4fbbd107595e9326b99fe0a8
 2021-03-23 01:02:00 +09:00
Treehugger Robot
7f7751db58 Merge "Remove reference of getActiveLinkproperties" am: 79ddf1afb8 am: fc25cb26f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645299

Change-Id: I6ab8cba01e409686202d046dae22658face9d06b
 2021-03-22 15:09:39 +00:00
TreeHugger Robot
ea7be3a489 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9941d8e007 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43364bcaa129eee2c2e7be575cdc04da4a728a7b
 2021-03-22 14:47:54 +00:00
Treehugger Robot
fc25cb26f9 Merge "Remove reference of getActiveLinkproperties" am: 79ddf1afb8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645299

Change-Id: I8a16f71a21a9bdc2c9195a999491b9ee09b35f95
 2021-03-22 14:18:35 +00:00
TreeHugger Robot
9941d8e007 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-22 14:03:49 +00:00
Treehugger Robot
79ddf1afb8 Merge "Remove reference of getActiveLinkproperties" 2021-03-22 13:39:40 +00:00
Treehugger Robot
1d40d06532 Merge "Make isDataCapable a public API" am: 965d021bf5 am: abed1c46be 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629275

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

Change-Id: If33c887416324e234c33dd42e9b8eeef659f7322
 2021-03-22 12:42:10 +00:00
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
3c975c208f Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca am: 3042783816 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972

Change-Id: I13d23ef04c694527a4440f6bed21699684ec7424
 2021-03-22 11:01:50 +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
junyulai
2b57c52b03 Remove reference of getActiveLinkproperties 
For callers who access the hidden API, replaced with
public APIs.

Test: atest FrameworksNetTests
Bug: 182963397
Merged-In: Ic0e895c77cf3efb78ddc333c4f3b1016cebcfe17
Change-Id: Ic0e895c77cf3efb78ddc333c4f3b1016cebcfe17
  (cherry-picked from ag/13929756)
 2021-03-22 18:14:37 +08:00
Bill Yi
291dfebc52 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6003ab9c212695a31695991f30a7e8dd2716930e
 2021-03-22 09:47:26 +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
67ab7d7eb0 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 9f1cd40748 -s ours am: 0e1deb1520 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645005

Change-Id: Ifa4c6a30dfec86d8860c365b3f4b343599ab3524
 2021-03-22 07:37:17 +00:00
Treehugger Robot
c000e91047 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: efbd8b3961 -s ours am: 64169ae2a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640144

Change-Id: I553b1c59e6a35c8e8a0ac7dc59d2367bffa1f39d
 2021-03-22 07:37:02 +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
7a966d4355 Merge "Remove Preconditions usage in TestNetworkSpecifier" am: 1077770f78 am: f0ae748bf5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644991

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

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

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

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

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

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

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

Change-Id: I4dc32278e38dc6b3d859a9b097375618b9b3cb40
 2021-03-22 03:56:37 +00:00
Roshan Pius
efd2d89db8 resolve merge conflicts of 403b7fd0b0 to stage-aosp-master am: fdc5eb6e56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13944446

Change-Id: Ia4f30adab268c9c51d89d61355a48da00b855190
 2021-03-22 03:55:23 +00:00
tim peng
1ff4cc3ff2 Merge "[Fix] Bluetooth device ordering" into rvc-qpr-dev am: a6b0836e95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13755425

Change-Id: Ib466ddd323da4c09d002b7e90d1ba0045425c216
 2021-03-22 03:54:17 +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
tim peng
a6b0836e95 Merge "[Fix] Bluetooth device ordering" into rvc-qpr-dev 2021-03-22 03:22:04 +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