Commit Graph

565701 Commits

Author SHA1 Message Date
Treehugger Robot
cd37173df6 Merge "Fix InetAddressCompat exception handling" 2021-03-19 16:38:54 +00:00
Treehugger Robot
a5e337b0b3 Merge "Keystore 2.0: Enable by default." 2021-03-19 16:06:00 +00:00
Remi NGUYEN VAN
9767b681e3 Fix InetAddressCompat exception handling
Fix InetAddressCompat exception handling to throw the original exception
in case of InvocationTargetException, rather than wrapping in a generic
IllegalStateException.

Bug: 183198868
Test: Test device with and without connectivity
Change-Id: Idc4d678afe9f20f920d7061790af4203ab75be26
2021-03-19 23:56:27 +09:00
SongFerng Wang
3ccc2738e2 Merge "Implementation of "Enable 2G" for Settings." 2021-03-19 13:09:55 +00:00
Treehugger Robot
0afaa9d9f6 Merge "Reset min_sdk_version of libmedia_jni" 2021-03-19 11:41:03 +00:00
Chiachang Wang
b53aeb4682 Merge "Add startCaptivePortalApp to system API" 2021-03-19 11:30:20 +00:00
Treehugger Robot
79d2054b14 Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed
* changes:
  Remove hidden API usage of RouteInfo
  Remove reference of NetworkAgent#unwanted()
  Remove references of NetworkAgentConfig constructor
  Remove reference of @ValidationStatus annotation
2021-03-19 11:23:18 +00:00
Chalard Jean
e07e3856da Merge "[NS03] Mix in other CS-managed properties" 2021-03-19 10:32:46 +00:00
Lucas Lin
46e3f1822d Merge "Expose getCapabilities" 2021-03-19 10:24:25 +00:00
Treehugger Robot
66794f915f Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" 2021-03-19 10:12:15 +00:00
Zoey Chen
a805d39229 Merge "[Telephony] Return if context is null when register TelephonyCallback" 2021-03-19 09:28:41 +00:00
Yo Chiang
544f3d5211 Merge "Keystore 2.0: Fix infinit recursion." 2021-03-19 08:10:39 +00:00
Janis Danisevskis
8758b2ceaf Keystore 2.0: Fix infinit recursion.
Fix endless recursion when Cipher is initialized with
AndroidKeyStorePrivateKey.

Fixes: 183167349
Test: atest android.keystore.cts.AndroidKeyStoreTest#testKeyStore_Encrypting_RSA_NONE_NOPADDING
Change-Id: I5b4166fb1a4e298072f7156ba61a64966e86dc53
2021-03-19 08:09:34 +00:00
Chiachang Wang
8ce1fa2313 Merge "Send a Network instead of network id for wifi no internet dialog" 2021-03-19 07:54:24 +00:00
Aaron Huang
3f4d2a6f67 Merge "Remove hidden API usage from ProxyTracker" 2021-03-19 07:50:27 +00:00
junyulai
bcb58a9757 Remove hidden API usage of RouteInfo
For callers who use hidden constructor of RouteInfo, replace
them with public constructor.

Test: TH
Bug: 182963397
Merged-In: I18d2cceafad633a95bd909b7f693d45e8a861bc9
Change-Id: I18d2cceafad633a95bd909b7f693d45e8a861bc9
  (cherry-picked from ag/13925164)
2021-03-19 15:49:38 +08:00
junyulai
705370a231 Remove reference of NetworkAgent#unwanted()
This is hidden, use onNetworkUnwanted instead.

Test: TH
Bug: 182963397
Merged-In: I4e80a75d25cfd9ffc07aa219fff5a2604eb307f2
Change-Id: I4e80a75d25cfd9ffc07aa219fff5a2604eb307f2
  (cherry-picked from ag/13925163)
2021-03-19 15:48:25 +08:00
junyulai
a1a61cde9c Remove references of NetworkAgentConfig constructor
This is hidden, use public Builder instead.

Test: TH
Bug: 182963397
Merged-In: Ib8ea2a17276cfd000e7003fc86d15458e1f82b39
Change-Id: Ib8ea2a17276cfd000e7003fc86d15458e1f82b39
  (cherry-picked from ag/13925162)
2021-03-19 15:47:24 +08:00
junyulai
557797e32c Remove reference of @ValidationStatus annotation
This is hidden and no longer accessible after ConnectivityService
becomes mainline module.

Test: TH
Bug: 182963397
Merged-In: Iaba678ed3af92f87cfeccaacf1cc5723c8e5dcae
Change-Id: Iaba678ed3af92f87cfeccaacf1cc5723c8e5dcae
  (cherry-picked from ag/13925161)
2021-03-19 15:45:57 +08:00
Lorenzo Colitti
d610e43383 Merge "Ensure all calls to getCallingUid use the version in mDeps." 2021-03-19 07:36:52 +00:00
Chalard Jean
f88102ce0e Merge "Use the NetworkScore API in VPN" 2021-03-19 06:16:37 +00:00
Aaron Huang
407610d73f Remove hidden API usage from ProxyTracker
Connectivity mainline module cannot use HandlerExecutor because it
is a hidden API. So, replace it with alternative.

Bug: 177035719
Test: FrameworksNetTests
Change-Id: I228a8a2e3479b0af1e977d13f877a565f0789a7e
2021-03-19 06:03:08 +00:00
Tianjie Xu
b079fe666f Merge "Report RoR metrics in recovery system" 2021-03-19 06:00:46 +00:00
Paul Hu
eed88a705d Merge "Remove hidden LinkProperties methods accesses" 2021-03-19 05:52:08 +00:00
Chalard Jean
93a3f18a40 Merge "[NS02] Mix in validation of the score" 2021-03-19 05:39:40 +00:00
Chalard Jean
395bde4d5f [NS03] Mix in other CS-managed properties
These properties are necessary to figure out the maximum
score of a network.

Test: FrameworksNetTests
Change-Id: I48dce20ad4a80597039393dca607e8da829b2a61
2021-03-19 13:50:56 +09:00
Chalard Jean
b5dbd7f46d [NS02] Mix in validation of the score
Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I9cac3a05ad0c4008599973b12d2c5e4c02233a5c
2021-03-19 13:50:56 +09:00
Treehugger Robot
47157e7711 Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" 2021-03-19 04:13:36 +00:00
Remi NGUYEN VAN
7e26e33269 Merge "Add TEST_NETWORK_SERVICE to module API" 2021-03-19 02:32:00 +00:00
Chiachang Wang
4a013645cb Send a Network instead of network id for wifi no internet dialog
It's a refactor work for incoming connectivity mainline. The
network information contained in the no internet notification
action was placed the target network id. The receiver which is
Settings will need to construct the network from the network id
using the hidden Network constructor. Since Network is moving
into module, Settings will not be able to access it. Apps should
use Network instead of network id, so just send the network
object to Settings.

Bug: 172183305
Test: manually test with no internet dialog and check the
      behavior and log
Test: atest FrameworksNetTests
Change-Id: I68acc70a26a27eeeb9ab7af068a459905839f942
2021-03-19 02:08:01 +00:00
Paul Hu
25be9509b8 Merge "Fix CS external dependencies on CarrierDefaultApp" 2021-03-19 01:41:25 +00:00
Chalard Jean
6df94880b3 Merge "Check for FEATURE_TELEPHONY instead of CM" 2021-03-19 00:59:04 +00:00
Remi NGUYEN VAN
2bf4c58ceb Add TEST_NETWORK_SERVICE to module API
TestNetworkManager is being unbundled; the TEST_NETWORK_SERVICE constant
is necessary for the module to register the manager with
registerContextAwareService.

Bug: 171540887
Test: m
Change-Id: I0690251ddfcdaa8a34830e110b75869a370de389
Merged-In: I0690251ddfcdaa8a34830e110b75869a370de389
2021-03-19 00:04:24 +00:00
Remi NGUYEN VAN
b648508ccb Merge "Add InetAddressCompat" 2021-03-18 23:58:16 +00:00
Remi NGUYEN VAN
c9f553c7ed Merge "Move network selection utils to Connectivity" 2021-03-18 23:57:34 +00:00
Treehugger Robot
be1b1d5550 Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." 2021-03-18 23:46:37 +00:00
Treehugger Robot
e72a7b4f1b Merge "Keystore 2.0: No longer install the legacy provider." 2021-03-18 21:38:17 +00:00
Kai Shi
26ba4d0d09 Merge "Add the LCE system API" 2021-03-18 21:23:34 +00:00
Janis Danisevskis
0b66a19bdd Keystore 2.0: No longer install the legacy provider.
The legacy provider is obsolete now that all calling code has
been fixed.

Bug: 183100147
Bug: 183093711
Bug: 171305684
Test: N/A
Merged-In: I0d71d3c9cdd586a508827eb26120c872cb8643ea
Change-Id: I0d71d3c9cdd586a508827eb26120c872cb8643ea
2021-03-18 20:24:39 +00:00
Amit Mahajan
afb77c6f83 Merge "Clarifying documentation for SliceInfo per API council feedback." 2021-03-18 19:55:52 +00:00
Janis Danisevskis
0b858aef63 Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase.
Bug: 183101158
Test: atest CtsLibcoreTestCases:com.android.org.conscrypt.javax.crypto.CipherBasicsTest#testAeadEncryption

Merged-In: Idc9c7dc2614a47818227a06fe76078f72c0c1f57
Change-Id: Idc9c7dc2614a47818227a06fe76078f72c0c1f57
2021-03-18 19:41:56 +00:00
Mohammad Islam
411f31c83b Merge "Append root cause with error message while parsing APEX" 2021-03-18 19:15:13 +00:00
Sudheer Shanka
da90e7a2bb Reland "Add an API to listen for changes in network blocked status of an uid."
This reverts commit 8623f2b3ca.

Reason for revert: The issue causing the build breakage has been fixed

Change-Id: I03fa406551b51aaa4d4d9255cf1a53f9b4bcc1bd
Merged-In: Ib9949b8619c6b148f73630b314c4113d76c31ec1
2021-03-18 19:11:55 +00:00
Tianjie
9a8538c819 Report RoR metrics in recovery system
Add metrics reporting for resume on reboot in RecoverySystem.
These metrics are reported before reboot. Details in
http://go/ror-metrics

Bug: 179105110
Test: build
Change-Id: I5a4cb56bd1e6596f41d35259be5be4958f4a20e9
2021-03-18 10:23:40 -07:00
Benedict Wong
d4b7104f7b Merge "Hide required underlying caps APIs" 2021-03-18 17:05:37 +00:00
Anthony Stange
677f4420b9 Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" 2021-03-18 16:52:08 +00:00
Anthony Stange
8623f2b3ca Revert "Add an API to listen for changes in network blocked status of an uid."
This reverts commit 7dc302d612.

Reason for revert: Breaking build - b/183106805
Bug: 183106805
Merged-In: Ib9949b8619c6b148f73630b314c4113d76c31ec1
Change-Id: I9789ed81e630f49c71034b6917188983bd11d774
2021-03-18 16:51:22 +00:00
Anthony Stange
0442fab063 Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE"
* changes:
  Revert "Replace the usage of UidRange"
  Revert "Expose uids related APIs in NetworkRequest and NetworkCa..."
2021-03-18 16:40:53 +00:00
Anthony Stange
5b7aad6995 Revert "Replace the usage of UidRange"
Revert "Add shims for NetworkRequest"

Revert submission 1626206-replaceUidRange

Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...

Change-Id: I6290429db1c8e787f8138b55b98fd92a74ac6402
2021-03-18 16:30:59 +00:00
Anthony Stange
24c33f7c4b Revert "Expose uids related APIs in NetworkRequest and NetworkCa..."
Revert "Add shims for NetworkRequest"

Revert submission 1626206-replaceUidRange

Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...

Change-Id: I45e08f89533af0d6851add38fecb5c6c114615ae
2021-03-18 16:30:59 +00:00