Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
565,463 Commits 3 Branches 0 Tags
f684b8d431c8fb814f396288d4cec7b1ebffd623
Commit Graph

565463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
f684b8d431 Merge "Move the VPN code out of packages/Connectivity." am: 8269d21dec am: 6011d5240c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6c73f67cc7e81025d8c55a437ada9ba4fce34ca
 2021-02-15 12:34:47 +00:00
Lorenzo Colitti
b79cddd608 Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac2c am: 8cec61d86f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6a2442a6dffe85c6d9f4783438b4a07865fd05
 2021-02-15 12:34:36 +00:00
Lorenzo Colitti
6011d5240c Merge "Move the VPN code out of packages/Connectivity." am: 8269d21dec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44cf61bec31d83217ca836aa387030818cd226cb
 2021-02-15 12:25:42 +00:00
Lorenzo Colitti
8cec61d86f Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac2c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1aca516555b1aea484aa962d1f538b3ae0eb9d4d
 2021-02-15 12:21:40 +00:00
Remi NGUYEN VAN
fe0e96c08b Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" am: 9efa77801d am: 0b263af1fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12c2fe14714d283e550234a1f05e386ccf6c8fbf
 2021-02-15 12:20:32 +00:00
Lorenzo Colitti
8269d21dec Merge "Move the VPN code out of packages/Connectivity." 2021-02-15 12:05:48 +00:00
Lorenzo Colitti
4e82e55794 Move the VPN code out of packages/Connectivity. 
Bug: 173331190
Test: atest FrameworksNetTests HostsideVpnTests CtsNetTestCases
Change-Id: Idc6ed1a544e744f8661d1e387da278736d407489
 2021-02-15 12:05:40 +00:00
Lorenzo Colitti
e322ecac2c Merge "Rename getVpnLockdownWhitelist to -Allowlist" 2021-02-15 12:04:24 +00:00
Lorenzo Colitti
30f4fb0bfe Rename getVpnLockdownWhitelist to -Allowlist 
Test: m
Change-Id: Id02a37624655c4ff88744c9c57af9f2a17953667
Merged-In: Id02a37624655c4ff88744c9c57af9f2a17953667
 2021-02-15 12:04:13 +00:00
Remi NGUYEN VAN
0b263af1fe Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" am: 9efa77801d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6e86d3195bff6fca762ecf057437f481fcbc884
 2021-02-15 11:51:59 +00:00
Treehugger Robot
a90997e606 Merge "Centralise logic for setting credential manager app" am: 353a2c4fde am: 6cf93cd8aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I866ec597d625668be13d8833c86b6105f66ee742
 2021-02-15 11:51:53 +00:00
TreeHugger Robot
5fb1be5080 Merge "DO NOT MERGE Disable privacy indicators" into rvc-qpr-dev am: 1639387a8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86d974a2e1274a218e74b2d5ac7576a85915b744
 2021-02-15 11:51:17 +00:00
Fabian Kozynski
75473c5d1e DO NOT MERGE Disable privacy indicators am: 2628cf48a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3f805d3196fb64c76294177b127fa1e730a5111
 2021-02-15 11:50:55 +00:00
Remi NGUYEN VAN
9efa77801d Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" 2021-02-15 11:39:25 +00:00
Treehugger Robot
6cf93cd8aa Merge "Centralise logic for setting credential manager app" am: 353a2c4fde 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0b3bf391c8c6db22dd932b785b8de21dbb92d52
 2021-02-15 11:37:32 +00:00
Kholoud Mohamed
eb740fdaae Merge "Exposed some testAPIs in NetworkPolicyManager" am: 4338d7f97a am: 199dd9b367 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23d3633cda96492ffd8f78b1cb2f348a771d8b05
 2021-02-15 11:35:49 +00:00
Lorenzo Colitti
61dd4acc51 Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." am: 4346a646e3 am: 46654fe81d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib20cb0ce6e981f71695edee77e428b4926266ea7
 2021-02-15 11:35:27 +00:00
Treehugger Robot
353a2c4fde Merge "Centralise logic for setting credential manager app" 2021-02-15 11:24:06 +00:00
TreeHugger Robot
1639387a8e Merge "DO NOT MERGE Disable privacy indicators" into rvc-qpr-dev 2021-02-15 11:21:02 +00:00
Kholoud Mohamed
199dd9b367 Merge "Exposed some testAPIs in NetworkPolicyManager" am: 4338d7f97a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I823a2663e5ea6fee8d71a3ed60a320fb1a00cd51
 2021-02-15 11:19:34 +00:00
Kholoud Mohamed
4338d7f97a Merge "Exposed some testAPIs in NetworkPolicyManager" 2021-02-15 11:12:27 +00:00
Lorenzo Colitti
46654fe81d Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." am: 4346a646e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81793b6c6ff3e4eb4146a115079443f76eecba13
 2021-02-15 11:00:37 +00:00
Lorenzo Colitti
4346a646e3 Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." 2021-02-15 10:42:18 +00:00
Lorenzo Colitti
8fdfd46218 BroadcastInterceptingContext: use passed-in broadcast Handler. 
Currently, BroadcastInterceptingContext always runs broadcast
receivers on the thread that called sendBroadcast. This means:

1. Receivers might run on the wrong thread, making the test less
   realistic.
2. If any receiver checks what thread it's running on, then
   either the check needs to be modified or deleted, or the test
   must call sendBroadcast on the thread that the receiver
   expects to run on. The latter is impossible when there is more
   than one receiver that needs to run on more than one thread.

This CL adds a setUseRegisteredHandlers method that allows tests
to say that they want each receiver to run on the Handler
specified at registration time.

This CL also enables the new mode for ConnectivityServiceTest,
and resolves a TODO to re-enable a disabled thread check.

The new mode cannot be enabled by default because it would break
most of the tests.

All the below tests pass except for the car bluetooth test
testAutoConnectAdapterOff_returnsImmediately which was already failing.

Bug: 173331190
Test: atest CarInputServiceTest BluetoothProfileDeviceManagerTest
Test: atest NetworkPolicyManagerServiceTest
Test: atest ConnectivityServiceTest
Test: atest TetheringTest TetheringNotificationUpdaterTest
Test: atest VersionedBroadcastListenerTest EntitlementManagerTest
Test: atest TetheringConfigurationTest
Test: atest CachedDeviceStateServiceTest
Test: atest EmergencyAffordanceServiceTest
Change-Id: I3303bb14516f07a55d82a16b59c111ab3f8b0389
 2021-02-15 10:40:32 +00:00
Rubin Xu
d6c19708af Merge "add MANAGE_CREDENTIALS appop" into rvc-qpr-dev-plus-aosp 2021-02-15 09:47:46 +00:00
Lorenzo Colitti
2762e7c607 Merge "Minor fixes to LockdownVpnTracker." am: 74cbf1917b am: 6e668591d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cfdfe54af4ff25e6ca8aee8ddccc74882a72f71
 2021-02-15 07:38:20 +00:00
Lorenzo Colitti
6e668591d8 Merge "Minor fixes to LockdownVpnTracker." am: 74cbf1917b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib400714e6faa8cf06487c5d6c721fdd444164fa4
 2021-02-15 06:58:45 +00:00
Lorenzo Colitti
74cbf1917b Merge "Minor fixes to LockdownVpnTracker." 2021-02-15 06:25:16 +00:00
Treehugger Robot
e510c506fe Merge "Expose VpnTransportInfo as module-lib API." am: 4a7e41a6e6 am: 094211dec4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c86cd1089bd4fe406fadf2e0ab6609558ed8510
 2021-02-15 05:51:10 +00:00
Treehugger Robot
094211dec4 Merge "Expose VpnTransportInfo as module-lib API." am: 4a7e41a6e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I746f6c33ae1076aa057eca1c731847bf59b7ba66
 2021-02-15 05:24:28 +00:00
Treehugger Robot
4a7e41a6e6 Merge "Expose VpnTransportInfo as module-lib API." 2021-02-15 04:54:13 +00:00
Lorenzo Colitti
ed9730e6f9 Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 45ec3191a7 am: 246444fef7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91816c01a799a89b89098a6e9ff256dae7d31dbf
 2021-02-15 01:03:06 +00:00
Lorenzo Colitti
98d12c7de9 Minor fixes to LockdownVpnTracker. 
1. Remove the legacy network type. This is only used for logging.
   - Replace the logcat logging with the display transport
   - Remove the EventLogTags logging, since it's likely not
     actually used by anyone.

2. Remove code that checks for NetworkInfo objects in state
   FAILED, since LockdownVpnTracker can never have received any
   such NetworkInfo from ConnectivityService since lollipop.

Bug: 173331190
Test: passes existing tests in ConnectivityServiceTest
Change-Id: I66ed71e51ba18b95862f3a0a5df2775eecea501e
 2021-02-15 09:58:20 +09:00
Lorenzo Colitti
d92d403e76 Expose VpnTransportInfo as module-lib API. 
This information originates in non-mainline system server code
and needs to be passed to the connectivity mainline code.

Bug: 173331190
Test: already covered by CTS tests
Change-Id: Ic612b6a51f7ec13e2213c8754312cf716130c876
 2021-02-15 09:34:19 +09:00
Lorenzo Colitti
246444fef7 Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 45ec3191a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I042d739aff199b0c7dff06008dcfaa9492e08d95
 2021-02-15 00:30:46 +00:00
Lorenzo Colitti
45ec3191a7 Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 
* changes:
  Check registering system default callback needs NETWORK_SETTINGS.
  Move VPN code from ConnectivityService to VpnManagerService.
  Add a skeleton VpnManagerService, and start it on boot.
  Convert LockdownVpnTracker to NetworkCallbacks.
  Minor fixes to VpnTransportInfo.
 2021-02-15 00:00:47 +00:00
Rubin Xu
592a85823e Merge "Add DPM.getKeyPairGrants()" am: 944e30cf6c am: aa0847edb5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571062

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ad6809ee6231592488e160fcfef571e452b5304
 2021-02-14 23:29:32 +00:00
Rubin Xu
aa0847edb5 Merge "Add DPM.getKeyPairGrants()" am: 944e30cf6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571062

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e1b40fa34cd02b2e0b69668328687169456602e
 2021-02-14 23:02:47 +00:00
Rubin Xu
944e30cf6c Merge "Add DPM.getKeyPairGrants()" 2021-02-14 22:22:47 +00:00
Treehugger Robot
3b43270cb8 Merge "Add KeyChain.createManageCredentialsIntent" am: acc78ee8eb am: 424cd636e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcd213b9e760b09f69753378c91a4afff47f63a9
 2021-02-14 22:18:50 +00:00
Treehugger Robot
424cd636e2 Merge "Add KeyChain.createManageCredentialsIntent" am: acc78ee8eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56b4c955a512f66a5d0ddf23f2edc140c067b86b
 2021-02-14 21:50:26 +00:00
Treehugger Robot
acc78ee8eb Merge "Add KeyChain.createManageCredentialsIntent" 2021-02-14 21:28:40 +00:00
Rubin Xu
603f3ee721 add MANAGE_CREDENTIALS appop 
This is part of the work to support
a credential management app on
unmanaged devices.

Bug: 179180345
Test: atest android.appsecurity.cts.AppOpsTest

Merged-In: Ifd87b5e38f341db4b34bf9f61480e29e49148846
Change-Id: Ifd87b5e38f341db4b34bf9f61480e29e49148846
 2021-02-14 19:16:09 +00:00
Rubin Xu
275601c126 Merge "Add KeyChainService credential management app APIs" am: e02debebcf am: e5ba22ab36 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40a70a22f5d652e24d3fb31569e639e9313927b1
 2021-02-14 18:38:40 +00:00
Rubin Xu
72ff9029c6 Add KeyChain.createManageCredentialsIntent 
Missed from previous cherry-pick.

Test: make -j docs
Bug: 179180345
Merged-In: I1e57ed9c18a1ada463c55dbf17ce30e31aa7bad2
Change-Id: I1d88e11740a13490613962c944b528e6c2bd0fcb
 2021-02-14 18:32:02 +00:00
Rubin Xu
e5ba22ab36 Merge "Add KeyChainService credential management app APIs" am: e02debebcf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id023e84b28ec938a90fe9a78bc985f12a0031609
 2021-02-14 18:10:10 +00:00
Rubin Xu
e02debebcf Merge "Add KeyChainService credential management app APIs" 2021-02-14 17:06:48 +00:00
Tianjie Xu
7056d6af26 Merge "Fix format of helper msg" am: 6e87192cef am: 190bdb1970 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d6dc40fffffaa92897d1cd5e04ee3a4fd99b932
 2021-02-14 03:32:19 +00:00
Tianjie Xu
190bdb1970 Merge "Fix format of helper msg" am: 6e87192cef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98e496df5538ad78cd2daa3b2dff887ee47ce557
 2021-02-14 03:05:19 +00:00
Tianjie Xu
6e87192cef Merge "Fix format of helper msg" 2021-02-14 02:27:41 +00:00