Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
564,599 Commits 3 Branches 0 Tags
a06b6244e83e6646fbc3e33bbfda834e71c6fad5
Commit Graph

564599 Commits

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaae55908a50ab13bb335e4ca742c1335f2d088f1
 2021-02-02 22:21:37 +00:00
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
Shashwat Razdan
5a53f7c676 Merge "Adding owners in smartspace packages" am: 10603d5102 am: 6bef558283 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570760

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52fc8a9d4f397c4076d966ae68ad8fe366f61f10
 2021-02-02 21:02:16 +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
e053159612 Merge "Add SIP configration Bundle keys for UA and CNI" am: 5c389e2507 am: d1a4eec020 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4cf04ca73239f84644edb654b6dc937505570ea
 2021-02-02 19:05:07 +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
Heemin Seog
84e0d68f06 DO NOT MERGE Dont restore focus on new HUN window am: 9d3b7aacd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13454385

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2b868b8e3be84e3e16fdf9a5c216b270e76e32e
 2021-02-02 15:34:23 +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
c0939803e9 Merge "Sort import statements in RoutingControlAction.java" am: ae728c12ac am: ae5b319d7e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4441733e174ac22883d7f030a8874920feba6b4b
 2021-02-02 13:01:01 +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
41db574a4d Merge changes I4f38a539,Id4f6c7f4 am: 22823382e4 am: f344ab8f12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565198

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01f1b30d188e4cedcdb34bcd8f7f25ac1a5c64b4
 2021-02-02 11:30:18 +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
0ca0316937 Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: c4cf8d3dfa am: ace78186e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1915652c73514ea7800911222b68253e07e719a9
 2021-02-02 09:32:27 +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
2b6eebf16d Merge "Fix typo in comment." am: 182e90d1ea am: 2a0adcf0c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569600

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22c2000d034934b16231c3f46c5e3d4ff3015edf
 2021-02-02 06:38:57 +00: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
Treehugger Robot
f99ed40471 Merge "Have connectivity self-register manager classes" am: 4ad0fdc5c9 am: 98c48f7101 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I512f95a45ab23d4b7e03c196850d0dab75223620
 2021-02-02 06:07:13 +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
bffb479a2f Merge "Use function inside NetdUtils instead of NetworkManagementService" am: 30a0fe39fd am: ac2004ef29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ac6a7d01878a646c4f19f6e0d54f948c7ec79eb
 2021-02-02 04:41:36 +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
db00fbb7b3 Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl" am: 0db5d441ad am: f486d1dc63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1568920

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica65ce3224b636cf71b69e37ff9f36315e9309f5
 2021-02-02 00:31:05 +00:00