Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
561,498 Commits 3 Branches 0 Tags
4fb9af6ceda3e7ddcfce0bbe0bfdcaa12a99ea0c
Commit Graph

561498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Franz
4fb9af6ced Merge "Add versioning to app compat framework" am: 80bbdfd100 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585009

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4796325c84396082256cec7c66fd1efdc623d36
 2021-02-16 12:21:08 +00:00
Benjamin Franz
80bbdfd100 Merge "Add versioning to app compat framework" 2021-02-16 11:48:36 +00:00
Lorenzo Colitti
ee109d8f3b Merge "New API for getting uids have specific permissions from SystemConfig" am: b8d9e77b2a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74be68b10c791d19a3b4287a91bcc1d1c174f647
 2021-02-16 09:09:31 +00:00
Lorenzo Colitti
b8d9e77b2a Merge "New API for getting uids have specific permissions from SystemConfig" 2021-02-16 08:24:21 +00:00
Frank Li
23d31b0274 Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: 5f2492095f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92df8ef58e30ddefb84001a0b45363e82fdd3621
 2021-02-16 03:08:00 +00:00
Frank Li
5f2492095f Merge "[CS01]Remove hidden API usage of NetworkCapabilities" 2021-02-16 02:42:53 +00:00
Tianjie Xu
dd36d03799 Merge "Support parsing legacy reboot escrow data" am: 8d38042009 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563080

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85de3f465b440b14ce0535bbd22ed6b76001c553
 2021-02-16 01:00:37 +00:00
Tianjie Xu
8d38042009 Merge "Support parsing legacy reboot escrow data" 2021-02-16 00:43:05 +00:00
Tianjie
44f3adc962 Support parsing legacy reboot escrow data 
Devices updating from R will still use the old version reboot escrow
data. We need to have the backward compatibility to avoid the one-time
failure.

Bug: 178646806
Test: atest FrameworksServicesTests:RebootEscrowDataTest;
Apply an OTA from SP1A.210114.001 to local build with fix, RoR succeeds.

Change-Id: I320966340faa80b97f79e732fb728260dfa1cee8
 2021-02-15 23:06:53 +00:00
Treehugger Robot
c9ba08c6c4 Merge "Add owners for contexthub framework code" am: b6ce95e889 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587271

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If45233dbe39b25f2f54bbdfee7dc8c7c8e123a3f
 2021-02-15 22:11:24 +00:00
Treehugger Robot
b6ce95e889 Merge "Add owners for contexthub framework code" 2021-02-15 21:45:02 +00:00
lifr
143cae6d33 [CS01]Remove hidden API usage of NetworkCapabilities 
The connection service will become the mainline module. The mutable
NetworkCapabilities is deprecated, and the NetworkCapabilities should
be built through their Builder instead.

Bug: 170598012
Test: atest FrameworksNetTests
Test: atest IpConnectivityMetricsTest
Change-Id: I73a4d3a7c118b9cef037ed52efb96ed123da2fa5
 2021-02-15 17:35:06 +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
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
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
Treehugger Robot
353a2c4fde Merge "Centralise logic for setting credential manager app" 2021-02-15 11:24:06 +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
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
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
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
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
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
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
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
James Mattis
d11f866ee6 Merge changes from topics "pans", "pans-permission" am: 601d16a336 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72035b6d5d6504cece1df472ae317e865ceb7882
 2021-02-13 21:14:48 +00:00
James Mattis
601d16a336 Merge changes from topics "pans", "pans-permission" 
* changes:
  Marking setOemNetworkPreference as @SystemApi
  Adding permission for OEM managed preferences
  Implementation of setOemNetworkPreference
 2021-02-13 20:54:57 +00:00
Rubin Xu
a9f241bb43 Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa8e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41e5c8a1d3a6ba5902515ffc89da200d7e9cd8a0
 2021-02-13 19:26:53 +00:00
Rubin Xu
c9a8b2fa8e Merge "add MANAGE_CREDENTIALS appop" 2021-02-13 18:32:16 +00:00
Kalesh Singh
06a5b4de17 Merge "Eliminate memtrack variability from the lost RAM calculation" am: 599b4e4ac4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a8f78264c5398430740368874c924db36967e04
 2021-02-13 07:35:55 +00:00
Kalesh Singh
599b4e4ac4 Merge "Eliminate memtrack variability from the lost RAM calculation" 2021-02-13 05:11:28 +00:00