Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
560,981 Commits 3 Branches 0 Tags
8804aed91cbed7426fe8360e6b6a89af172aab45
Commit Graph

560981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cody Kesting
8804aed91c Merge changes from topic "vcn-network-policy" am: e980914d42 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If22d811bfa933cae37afdc15dea6f43275bd128b
 2021-02-02 21:48:34 +00:00
Cody Kesting
e980914d42 Merge changes from topic "vcn-network-policy" 
* changes:
  Implement Network policy in VcnManagementService.
  Unit test UnderlyingNetworkTracker.
  Register NetworkCallbacks in UnderlyingNetworkTracker.
 2021-02-02 20:33:50 +00:00
Shashwat Razdan
6bef558283 Merge "Adding owners in smartspace packages" am: 10603d5102 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12c133d06899001662b02e1432f85e361c436c26
 2021-02-02 20:31:55 +00:00
Nazanin Bakhshi
63bb8c664e Merge "Add an event and a parcelable to receive bluetooth framework call quality signal" am: 99955ce46b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566906

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a8e3239c25828487693e12ca5837911ee03e9bf
 2021-02-02 20:27:37 +00:00
Shashwat Razdan
10603d5102 Merge "Adding owners in smartspace packages" 2021-02-02 20:23:26 +00:00
Nazanin Bakhshi
99955ce46b Merge "Add an event and a parcelable to receive bluetooth framework call quality signal" 2021-02-02 19:21:22 +00:00
Brad Ebinger
d1a4eec020 Merge "Add SIP configration Bundle keys for UA and CNI" am: 5c389e2507 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie115198f4e69bf4cd270980315bfc9a98e522e87
 2021-02-02 18:49:23 +00:00
Brad Ebinger
5c389e2507 Merge "Add SIP configration Bundle keys for UA and CNI" 2021-02-02 17:53:18 +00:00
Shashwat Razdan
057896ae34 Adding owners in smartspace packages 
Test: not needed as this is a meta file change

Change-Id: I32f5205c4c1b771aae963a20e9a52fa7691ce271
 2021-02-02 17:50:18 +00:00
Treehugger Robot
36adf13e62 Merge "Update frameworks to use unbundled version of BouncyCastle." am: 19547685bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I691da785142fee5967674ac2cf1261e71c1f16e3
 2021-02-02 14:41:24 +00:00
Junyu Lai
2562ab4856 Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: 4a76351c9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48f029e663fe397ce0f88d2de7a758530c093012
 2021-02-02 14:37:47 +00:00
Treehugger Robot
19547685bb Merge "Update frameworks to use unbundled version of BouncyCastle." 2021-02-02 14:37:05 +00:00
Junyu Lai
4a76351c9b Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" 2021-02-02 13:57:57 +00:00
Treehugger Robot
ae5b319d7e Merge "Sort import statements in RoutingControlAction.java" am: ae728c12ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If683b283e17811bb629106c84ec90e13121ef8ef
 2021-02-02 12:14:26 +00:00
Treehugger Robot
ae728c12ac Merge "Sort import statements in RoutingControlAction.java" 2021-02-02 11:43:08 +00:00
Lorenzo Colitti
f344ab8f12 Merge changes I4f38a539,Id4f6c7f4 am: 22823382e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565198

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id68e4e0ff5995bbf04859834fb2aa0936ef651bc
 2021-02-02 10:46:37 +00:00
Lorenzo Colitti
22823382e4 Merge changes I4f38a539,Id4f6c7f4 
* changes:
  Add the underlying networks to NetworkAgentInfo#toString.
  Improve testing for network blocking.
 2021-02-02 10:06:03 +00:00
Paul Hu
ace78186e4 Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: c4cf8d3dfa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8063e83503dce99985e999235ab7eb75f7cd747
 2021-02-02 09:07:11 +00:00
Paul Hu
c4cf8d3dfa Merge "Remove ArrayUtils usage in connectivity frameworks classes" 2021-02-02 08:47:04 +00:00
Lorenzo Colitti
ee73d9b87c Add the underlying networks to NetworkAgentInfo#toString. 
This is useful in debugging VPN networks.

Bug: 173331190
Test: manual
Change-Id: I4f38a53980191a1813c2ef313fedc51af98f18f6
 2021-02-02 16:17:22 +09:00
Lorenzo Colitti
ac799e5a4d Improve testing for network blocking. 
This simplifies the uidNetworkingBlocked method and makes it more
realistic by supporting more combinations of rules than just the
four used by this test.

Also support RULE_ALLOW_METERED, and add test coverage for it.

Test: test-only change
Change-Id: Id4f6c7f41429f3ae7841d3214b3e5e95ec591f85
 2021-02-02 16:17:22 +09:00
Donald Chai
2a0adcf0c6 Merge "Fix typo in comment." am: 182e90d1ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieac6d18eb9d25e0b826d9441b3a9033e3b8de621
 2021-02-02 06:38:26 +00:00
James Lin
3640adadee Merge "[RCS UCE] Add the APIs to access the device config of RCS User Capability Exchange enabled" am: 02bf7d1288 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566998

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0dc0528dc475aaab0868ce891340c2cc815712dd
 2021-02-02 06:09:49 +00:00
Donald Chai
182e90d1ea Merge "Fix typo in comment." 2021-02-02 06:07:18 +00:00
James Lin
02bf7d1288 Merge "[RCS UCE] Add the APIs to access the device config of RCS User Capability Exchange enabled" 2021-02-02 05:52:03 +00:00
Aravind Angadi
be480e61e0 Sort import statements in RoutingControlAction.java 
Test: None

Change-Id: If6556c47fed63a01013ffa1a2a0ccc2afd774989
 2021-02-02 05:47:58 +00:00
Treehugger Robot
98c48f7101 Merge "Have connectivity self-register manager classes" am: 4ad0fdc5c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73f3c0c312ae9e1786204776e98240c259416a8b
 2021-02-02 05:43:12 +00:00
Treehugger Robot
4ad0fdc5c9 Merge "Have connectivity self-register manager classes" 2021-02-02 05:01:04 +00:00
Lucas Lin
ac2004ef29 Merge "Use function inside NetdUtils instead of NetworkManagementService" am: 30a0fe39fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc30a45e691ec76703452595b62b588b78cd8048
 2021-02-02 04:18:56 +00:00
Donald Chai
5f3a83529c Fix typo in comment. 
Change-Id: Ie35db2cfef32543e573bf701d2d523f5f1502161
Tested: N/A
 2021-02-02 03:58:05 +00:00
Lucas Lin
30a0fe39fd Merge "Use function inside NetdUtils instead of NetworkManagementService" 2021-02-02 03:38:38 +00:00
junyulai
cddc3dde5d [VCN08] Expose NOT_VCN_MANAGED capability as system API 
Test: m -j doc-comment-check-docs
Fix: 177299683
Bug: 175662146
Change-Id: Iaa53d21774ea48af5fe339b57bf1235c77f295a0
 2021-02-02 11:34:09 +08:00
Brad Ebinger
c28d5844dd Add SIP configration Bundle keys for UA and CNI 
Adds IMS SIP configuration bundle keys for User-Agent and
Cellular-Network-Info headers required by some networks.

Bug: 178606181
Test: atest CtsTelephonyTestCases:SipDelegateManagerTest
Change-Id: I389162ca0c6348580f6ee8bb6ce5ee3a4e84595e
 2021-02-02 00:53:02 +00:00
Jeff Sharkey
f486d1dc63 Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl" am: 0db5d441ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1568920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I961376b02a6ffe105cb547e741d66774acdffeeb
 2021-02-02 00:25:53 +00:00
Mitch Phillips
cad354ec50 Merge "[MemInit] Use new MemInit API." am: 8a956c5f9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555544

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1332e4476cc8470791cacae0bbe605a24d1e3b18
 2021-02-02 00:04:59 +00:00
Serik Beketayev
82e4d3638c Merge "[Mainline] Migrate com.google.android.collect pkg" am: b9c6a7470e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1648cf0bc1803d59787edb8715b0abc63728cc5d
 2021-02-01 23:50:59 +00:00
Jeff Sharkey
0db5d441ad Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl" 2021-02-01 23:45:18 +00:00
Dmitri Plotnikov
1ef5d3f87e Add BATTERY_STATS_OWNERS for IBatteryStats.aidl 
Change-Id: Iffb8ded9ff5edc899ab38c74ffe3ad98793ca67c
 2021-02-01 23:42:59 +00:00
Daniel Bright
3504c8c759 Merge "Partial hal support for secondary link bandwidth" am: bed5f6e84d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565115

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib46315e1fe0bf0a69cc17c6d73cd913379a73845
 2021-02-01 23:42:52 +00:00
Lorenzo Colitti
b6925c2fc7 Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." am: d6d96a4625 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565204

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id00ebe6331ae65ba4c3ee2f549e89ba3a527bd2c
 2021-02-01 23:32:34 +00:00
Mitch Phillips
8a956c5f9c Merge "[MemInit] Use new MemInit API." 2021-02-01 23:32:24 +00:00
Serik Beketayev
b9c6a7470e Merge "[Mainline] Migrate com.google.android.collect pkg" 2021-02-01 23:11:56 +00:00
Daniel Bright
bed5f6e84d Merge "Partial hal support for secondary link bandwidth" 2021-02-01 22:48:44 +00:00
Cody Kesting
07979a07cc Implement Network policy in VcnManagementService. 
This CL implements #getUnderlyingNetworkPolicy() for
VcnManagementService. Specifically, it takes the provided
NetworkCapabilities and checks for a corresponding VCN. If one exists,
a VcnUnderlyingNetworkPolicy will be returned with a copy of the
original NetworkCapabilities without the capability NOT_VCN_MANAGED and
with the unwanted capability NOT_VCN_MANAGED.

Any NetworkCapabilities without a corresponding VCN will be returned a
VcnUnderlyingNetworkPolicy with the original NetworkCapabilities intact.

Bug: 175914059
Test: atest FrameworksVcnTests
Change-Id: Icdffc4f586f58a0e5b6290d5c6449e2bbed5cab0
 2021-02-01 14:46:58 -08:00
Cody Kesting
f029daa404 Unit test UnderlyingNetworkTracker. 
Bug: 177364490
Test: atest FrameworksVcnTests
Change-Id: I681b0bef27cdd1974a574e81b4b435578cd6e9cd
 2021-02-01 14:46:57 -08:00
Cody Kesting
a382c9ca0c Register NetworkCallbacks in UnderlyingNetworkTracker. 
This CL updates UnderlyingNetworkTracker to register NetworkCallbacks.
UnderlyingNetworkTracker uses two types of NetworkCallbacks:
  - bringup requests
  - selection requests

Bringup requests ensure that VCN-managed Networks are not reaped.
Separate bringup requests are filed for wifi and cell Networks. One cell
request is filed for each subscription ID (subId) in the VCN's
subscription group.

Selection requests are used to allow ConnectivityService to perform
Network selection for the VCN's selected underlying Network (the Network
that VCN traffic will be routed through).

Bug: 177364490
Test: atest FrameworksVcnTests
Change-Id: Ic4dc13a3f7acf08589ddb25b343af2677cd7cf65
 2021-02-01 14:46:57 -08:00
Lorenzo Colitti
d6d96a4625 Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." 2021-02-01 22:45:00 +00:00
James.cf Lin
1d44f9e09e [RCS UCE] Add the APIs to access the device config of RCS User Capability Exchange enabled 
Bug: 178239287
Test: atest -c CtsTelephonyTestCases:android.telephony.ims.cts.RcsUceAdapterTest
Change-Id: I1bd2d0e0dc88dcd72e7c2682483c8039f4aa8927
 2021-02-02 06:30:49 +08:00
Mikhail Naganov
15b8dd5aad Merge "Remove audio HAL V2 from "interfaces of interest"" am: 499850f976 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10bb28505163ae9651c9191ef11bc17500dd6b07
 2021-02-01 22:20:27 +00:00
Nazanin
9bf6b3de91 Add an event and a parcelable to receive bluetooth framework call 
quality signal

Bug: 173137125
Test: manual test check for regression
Change-Id: I38e70ea284707d39cec7cb4fbdfd36be4f83e403
Merged-In: I38e70ea284707d39cec7cb4fbdfd36be4f83e403
 2021-02-01 21:36:48 +00:00