Commit Graph

560859 Commits

Author SHA1 Message Date
Michael Wright
471c70287e Merge "Consolidate OWNERS for input" 2021-02-23 00:11:44 +00:00
Josh Gao
35a5c1501f Merge "NativeTombstoneManager: fix tombstone parsing." 2021-02-22 23:46:25 +00:00
Treehugger Robot
75025c5b62 Merge "Keystore 2.0: Fix correct handling of Uid/Namespace" 2021-02-22 23:35:21 +00:00
Michael Wright
bea28e9f39 Consolidate OWNERS for input
Bug: N/A
Test: N/A
Change-Id: Ib1b3172575b50fbd3869e173d3a751864600173a
2021-02-22 23:30:08 +00:00
Treehugger Robot
2bd3073819 Merge "Release virtual display before stopping projection" 2021-02-22 23:09:02 +00:00
Jeff Sharkey
c31e4a1e00 Merge "Add michaelwr@ to Shell OWNERS" 2021-02-22 22:29:05 +00:00
Treehugger Robot
e0db8b998f Merge "BugreportManager API review updates." 2021-02-22 21:46:41 +00:00
Chih-hung Hsieh
af4f8b9510 Merge "Do not add quotes around flags argument" 2021-02-22 21:04:34 +00:00
Janis Danisevskis
fa1a21957c Keystore 2.0: Fix correct handling of Uid/Namespace
AndroidKeyStoreKeyPairGeneratorSpi used the Uid as namespace which is
wrong, and ParcelableKeyGenParameterSpec inadvertently used the Uid as
namespace specifier during conversion.

Bug: 160623310
Test: com.android.keychain.tests.BasicKeyChainServiceTest#testGenerateKeyPairErrorsOnBadUid
Change-Id: I84b4c69c639e42922449e00a3708cef89b82f63e
2021-02-22 12:55:35 -08:00
Tianjie Xu
7444774737 Merge "Throw an exception in RoR api on no-pin case" 2021-02-22 20:42:35 +00:00
Treehugger Robot
e22fe5dd7d Merge "Clean up T&C implementation" 2021-02-22 19:58:43 +00:00
Andrew Cheng
1c276e7591 Merge changes from topic "hci-disconnect-reason"
* changes:
  Update Companion to new BluetoothConnectionCallback
  Add BluetoothConnectionCallback to Companion App
  Surface ACL disconnect reasons from native to Java
  Make BluetoothConnectionCallback static
2021-02-22 19:25:13 +00:00
Treehugger Robot
7c5f3fe057 Merge "Support cuttlefish with an emulated 2GB SD" 2021-02-22 19:10:37 +00:00
Phil Weaver
2dcd402cdc Merge "Fix concurrent modify exception for A11y" 2021-02-22 18:37:05 +00:00
Julien Desprez
d46665bdd7 Merge "Clean up cc_test TEST_MAPPING after default update" 2021-02-22 18:31:07 +00:00
Daniel Bright
6fccdbb8d3 Merge "Added javadoc to apn retry \ throttling related methods" 2021-02-22 18:13:28 +00:00
Treehugger Robot
782fa90be7 Merge "Fix NPE in AutofillManager when feature autofill is disabled" 2021-02-22 17:37:55 +00:00
Cody Kesting
32a2e39563 Merge "Expose VCN Network policy APIs." 2021-02-22 17:24:02 +00:00
Cody Kesting
f74c6031f1 Expose VCN Network policy APIs.
This CL exposes APIs used for a) receiving VCN Network policy updates
and b) applying VCN Network policies to a given Network. Specifically,
these APIs should be used to receive notifications from VcnManager
whenever a VCN Network policy may have changed - generally, following a
VCN starting up, tearing down, or entering Safe Mode.

When a VcnNetworkPolicyListener is notified of a policy change, the
listener should query VcnManager#applyVcnNetworkPolicy to receive the
updated VcnNetworkPolicyResult. This policy result informs the listener
of their resulting NetworkCapabilities and also whether a Network
teardown is required as a consequence of the policy change.

Bug: 177020190
Test: atest FrameworksVcnTests
Change-Id: Ied78a57973a4ceaa7ef4cd9feee64478137497b8
2021-02-22 17:23:40 +00:00
Cody Kesting
c70a7d6258 Merge changes I1ceccedd,Ide2c7302
* changes:
  Change Exception class references to use Class.getName().
  Define VcnNetworkPolicyListener for VCN transports.
2021-02-22 17:23:14 +00:00
Mathew Inwood
a3ab19e8f3 Merge "Set updateable:false explicitly in apex rules." 2021-02-22 16:56:13 +00:00
Artem Radchenko
3218ac8864 Fix NPE in AutofillManager when feature autofill is disabled
When feature_autofill is not present on device IAutoFillManager service could be null.
It is proposed to check service for null before trying to add client to prevent NPE.

Bug: 174444980
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases \
    -t android.widget.cts.DatePickerTest#testPartsVisibilityInSpinnerMode
Signed-off-by: Artem Radchenko <artem.radchenko@globallogic.com>
Change-Id: Id6bad7e652452343ed674e4a7452a1b8231f72c5
Merged-In: I10ce988603f47117d0efddcc014ec51b72d3b3b4
2021-02-22 14:51:08 +00:00
Eric Laurent
6c0a02ad30 Merge "[Bugfix]audio:force show safe volume warning dialog" 2021-02-22 13:47:10 +00:00
Joseph Pirozzo
9cabf5a07b Merge "Add BluetoothMapClient to system API" 2021-02-22 13:10:08 +00:00
Lucas Lin
654b0fff63 Merge changes I852e3a53,I86755647,I0ed8b0c6
* changes:
  Remove unused INetworkManagementService from IpSecService
  Use NetdUtils instead of NetworkManagementService in Vpn
  Use NetdUtils instead of NetworkManagementService in IpSecService
2021-02-22 06:49:39 +00:00
Treehugger Robot
9203e5b94a Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" 2021-02-22 06:12:48 +00:00
Paul Hu
7d72edb937 Merge "Expose NetworkWatchlistManager#getWatchlistConfigHash" 2021-02-22 05:23:04 +00:00
Paul Hu
19af44e2ce Merge "Stop using SysetmConfig#getSystemPermissions on PermissionMonitor" 2021-02-22 05:22:37 +00:00
Paul Hu
fb70ef5a24 Merge "Remove ArrayUtils usage in connectivity classes" 2021-02-22 05:22:01 +00:00
Lorenzo Colitti
fd6a27bf49 Revert "Revert "Delete VPN methods in ConnectivityManager.""
1. Stop using ConnectivityManager for VPNs in VpnDialogs.
2. Delete updateLockdownVpn, since all callers have been migrated
   to calling VpnManager directly.
3. Delete the call to VpnManager in factoryReset, since the only
   caller (ResetNetworkConfirm) has been updated to call into
   VpnManager directly.
4. Delete getVpnManager, since it is now unused.

This reverts commit 51bf8e979e.

Reason for revert: should be safe to submit now that aosp/1596096 is merged

Bug: 173331190
Test: treehugger
Change-Id: Ife3607c024006ce4fe46c981e9742170becb6331
2021-02-22 05:07:22 +00:00
Treehugger Robot
6b501d8acf Merge "Use RouteInfo API constructor in VpnService" 2021-02-22 04:05:51 +00:00
Chih-Hung Hsieh
c8d81cf67a Do not add quotes around flags argument
* build/soong will adds quotes around the whole flags
  and preserve the quotes around flags argument.
  The quotes incorrectly became part of a flag's value.
* build/soong adds automatically module directory to
  -header-filter.
* allow new found .h file clang-tidy warnings, not as errors.

Bug: 180862582
Test: make; make with WITH_TIDY=1
Change-Id: I460d56284a843ad5e85a36c47fc3981f49d04f4a
2021-02-21 18:46:52 -08:00
Daniel Bright
43b78ebef7 Added javadoc to apn retry \ throttling related methods
Bug: 175092152
Test: N/A
Merged-In: I35a3b97f3e52eef68310a92178bb14495641c6e7
Change-Id: I35a3b97f3e52eef68310a92178bb14495641c6e7
2021-02-21 14:44:43 -08:00
Jack Yu
8359ebecc3 Merge "Simplified the initial attach APN logic" 2021-02-21 18:14:03 +00:00
Orion Hodson
0248d32dc3 Merge "libandroid_runtime,libhwui: use libnativehelper_lazy" 2021-02-21 10:03:21 +00:00
Jack Yu
d5f25c2262 Simplified the initial attach APN logic
1. Instead of using the hardcoded order, read the order
   from configuration. This also allows carriers to specify
   the allowed types of APN can be used for initial attach.
2. Removed the preferred APN logic. The preferred APN is
   specifically for the default APN after a successful data
   setup. It's not related to initial attach.

Fix: 169657628
Test: Manual
Merged-In: I9fbf4f270726cba1281770db88fec7c1bb62e6db
Change-Id: I9fbf4f270726cba1281770db88fec7c1bb62e6db
(cherry picked from commit 0bebba7378)
2021-02-21 01:23:25 -08:00
James Mattis
1444e3eea1 Merge "Using defensive copy for default request remove" 2021-02-21 04:28:13 +00:00
James Mattis
ff5fb79411 Using defensive copy for default request remove
Passing in a defensive copy for the default requests in
ConnectivityService prior to updating that collection so as to not have
issues when removing elements as part of the per-app preference update
flow.

Bug: 176494815
Bug: 178632672
Test: atest FrameworksNetTests
atest FrameworksNetTests:com.android.server
.ConnectivityServiceTest#testSetOemNetworkPreference
ClearPreviousOemValues --iterations

Change-Id: Ia683d5035dda2be35fd2f2b7ee038e806caab6f9
2021-02-20 15:51:24 -08:00
James Mattis
c1115803bc Merge "Unit test automation for Multilayer Evaluation" 2021-02-20 21:23:45 +00:00
Treehugger Robot
08bf2e8f49 Merge "Keystore 2.0: Revisite Authorization.java" 2021-02-20 19:26:58 +00:00
Junyu Lai
3237216211 Merge "[FUI15] Remove networkId in NetworkState" 2021-02-20 14:00:19 +00:00
paulhu
0ab41fc1f3 Stop using SysetmConfig#getSystemPermissions on PermissionMonitor
Repalace the API with SysetmConfigManager#getSystemPermissionUids
and update the design/test accordingly.

Bug: 177188455
Test: atest FrameworksNetTests
Test: atest FrameworksNetIntegrationTests
Test: atest CtsNetTestCases
Change-Id: I8b553b934252b93c60b815715680427a41620054
2021-02-20 16:20:19 +08:00
Treehugger Robot
bfc1f6b382 Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." 2021-02-20 06:57:04 +00:00
Andrew Cheng
6793c1784a Update Companion to new BluetoothConnectionCallback
Added new disconnect reason to BluetoothConnectionCallback.

Bug: 177668957
Test: manual, ensure disconnect reasons appear in logcat
Change-Id: I322e0c4241644a9cf8f4d99c6f3920a8715eb5e2
2021-02-20 06:31:11 +00:00
Andrew Cheng
af705d2676 Add BluetoothConnectionCallback to Companion App
Tag: #refactor
Fixes: 180729821
Test: atest BluetoothInstrumentationTests
Merged-In: Id24a4b3a3510781d9105763b1722f44583a7fd7c
Change-Id: I598428052191e4a23e4d7cd0b265c84a088431c7
2021-02-20 06:19:45 +00:00
Andrew Cheng
b8e09882d8 Surface ACL disconnect reasons from native to Java
HCI disconnect commands and events have an accompanying "reason"
parameter comprising of a HCI error code. This can be useful in both
debugging and re-connection logic at the Java level.

This CL grabs the HCI codes from native and passes it up to Java via an
extra parameter to existing ACL connection callbacks.

Tag: #feature
Bug: 177668957
Test: atest BluetoothInstrumentationTests

Change-Id: Ic729140b8ffb1273a9ca53cdfd39c9f5d71e1522
2021-02-20 05:50:03 +00:00
Chiachang Wang
63bc7bd3c2 Merge changes I0a75c440,Ief9e8925,Ie03e8276,If0ac9a64,I716bd771
* changes:
  [IT06]Move INetworkActivityListener into connectivity module
  [IT05] Remove the unused network activity logic out from NMS
  [IT4.7] Add network activity info into dumpsys for debugging
  [IT4.6] Unbundle NMS out from ConnectivityManager
  [IT4.5] Update radio power from CS directly
2021-02-20 02:02:46 +00:00
James Mattis
a917e5a283 Unit test automation for Multilayer Evaluation
Unit test automation for multilayer network hierarchy evaluation
when using the setOemNetworkPreference() API ConnectivityService.

Bug: 178632672
Bug: 176494815
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Ia9b76f49a07eff6a3977faaa41fc67a10f307841
2021-02-19 17:41:01 -08:00
James Mattis
ed4288b164 Merge "Unit tests for Multi-Default with Existing APIs" 2021-02-20 01:38:52 +00:00
Josh Gao
d6ed3cd9da NativeTombstoneManager: fix tombstone parsing.
For unclear reasons, this was silently succeeding on AOSP, and throwing
a ProtoParseException on internal.

Bug: http://b/159164105
Test: `adb shell crasher` on sc-vf-dev, sc-dev
Change-Id: I605e9db49e344bd57a4e33d32808ca2b5b6f4231
2021-02-19 16:33:59 -08:00