Commit Graph

560142 Commits

Author SHA1 Message Date
Bob Badour
336e38d3f2 Fix license_type. Contains GPL
See: http://go/android-license-checking-v2-lsc

Test: m all

Bug: 151953481
Bug: 151177513
Bug: 67772237

Exempt-From-Owner-Approval: janitorial work

Change-Id: I297f7e55415dcff0765b46841879b25c03c50aa9
2021-01-27 12:09:16 -08:00
Daniel Bright
d7d4b0ca85 Merge "Add S-NSSAI" 2021-01-27 18:48:54 +00:00
Andrei-Valentin Onea
51164692d0 Merge "Persist compat framework overrides across reboot" 2021-01-27 18:17:11 +00:00
Benedict Wong
2cfb250d6d Merge "Implement DisconnectingState" 2021-01-27 18:13:10 +00:00
Treehugger Robot
62bdf8c076 Merge "Watchdog: Rename properties to follow guidelines" 2021-01-27 15:43:17 +00:00
Woody Lin
bc8d470970 Watchdog: Rename properties to follow guidelines
Bug: 141948707
Bug: 178498518
Change-Id: Iefbeae8da80308be148610dc87d20553a290f4c5
2021-01-27 21:57:53 +08:00
Jeff DeCew
6671f75e1d Merge "Add 'Android Resources' team as OWNERS of classes in android.util" 2021-01-27 13:18:49 +00:00
Treehugger Robot
f9dbe61693 Merge "[FUI03] No-op refactoring of VpnInfo" 2021-01-27 11:47:34 +00:00
Howard Chen
da932b4a45 Merge "Refine the DSU SD card support" 2021-01-27 08:40:34 +00:00
Remi NGUYEN VAN
d9f9d4a5d5 Merge "Move connectivity-sources to frameworks/base" 2021-01-27 07:15:05 +00:00
junyulai
fa528b2d20 [FUI03] No-op refactoring of VpnInfo
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
  1. Move VpnInfo to android.net
  2. Add nullability annotations
  3. Make members final

Bug: 174123988
Test: TH
Change-Id: I1530bb45d0e84c28c6deac33596bc686058afc0d
2021-01-27 15:03:06 +08:00
Treehugger Robot
37356f4149 Merge "Keystore 2.0 SPI Small doc comment fixup." 2021-01-27 05:00:40 +00:00
James Mattis
96ccce1940 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7
* changes:
  Updates to handler logic for multilayer requests
  Update to sendAllRequestsToProvider for Multilayer
  Multilayer request updates to request callbacks
  Multilayer support when NAI requests are updated
2021-01-27 04:50:43 +00:00
Chiachang Wang
8dc248c84a Merge "Expose UdpEncapsulationSocket.getResourceId()" 2021-01-27 04:41:18 +00:00
James Mattis
0985f94623 Updates to handler logic for multilayer requests
Updates to ConnectivityService network request handler's logic to support
(or disallow support of) multilayer network requests.

Bug: 175239920
Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Ic67cff950d72745d6508a0a037bd33f932d5132c
2021-01-26 18:44:45 -08:00
James Mattis
46ac053990 Update to sendAllRequestsToProvider for Multilayer
Updates to ConnectivityService.sendAllRequestsToProvider to support
Multilayer requests.

Bug: 175051182
Bug: 171991028
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Id7a6175cee28d2de1f6194cd0fc8c739d667427d
2021-01-26 18:44:32 -08:00
Chiachang Wang
1bd8cd59a5 Merge "Update jni to get int descriptor in native layer" 2021-01-27 02:44:29 +00:00
Chiachang Wang
db2cec6024 Update jni to get int descriptor in native layer
ConnectivityService is going to become a mainline module which
can not access the hidden APIs. The int descriptor of a
FileDescriptor is hidden for internal use only. The Network and
NetworkUtls will be parts of CS module. The corresponding usage
should be removed. There is no way in a module to access the
descriptor, so update the jni to set a FileDescriptor to native
to get the int descriptor inside the platform.

Also, update the other references in android_net_NetUtils for
getting fd to use the NDK functions in the libnativehelper.

Bug: 170598012
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Test: manually connect to a VPN
Change-Id: I2143c079feac53917a6e7bf7422f3180f51437fb
2021-01-27 02:44:14 +00:00
Benedict Wong
f0aa57318d Merge "Prep VCN files for exposing APIs" 2021-01-27 02:34:09 +00:00
Treehugger Robot
b4203793bf Merge changes I8fffd952,Ief6690bb
* changes:
  Add shell commands for app hibernation service
  Add basic hibernation state management
2021-01-27 01:36:43 +00:00
Chiachang Wang
5e26cc8c56 Expose UdpEncapsulationSocket.getResourceId()
ConnectivityManager.createSocketKeepalive() will need to get
the socket resource ID as a parameter for creating a new
NattSocketKeepalive. ConnectivityManager is a part of incoming
ConnectivityService mainline, so expose getResourceId() as an
API since the hidden APIs are not accessible for a mainline
module. This API should not be exposed to apps, so make it a
MODULE_LIBRARIES system API.

Bug: 172183305
Test: make update-api
Change-Id: Ic0722352ea186fcb18a2d91cc3969f771fde9e86
2021-01-27 09:27:26 +08:00
Janis Danisevskis
e553efeb7a Keystore 2.0 SPI Small doc comment fixup.
Test: N/A
Change-Id: Ia54b912092431569cac64e228b902abd6383f728
2021-01-26 16:49:16 -08:00
Paul Hu
5d496eb9b3 Merge "Fix FrameworksNetIntegrationTests failure" 2021-01-27 00:04:09 +00:00
Paul Hu
742ec924e8 Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" 2021-01-27 00:04:09 +00:00
Treehugger Robot
9e5385798e Merge "Keystore 2 SPI: Fix KeyStorePublicKey getEncoded()." 2021-01-26 23:45:52 +00:00
Josh Gao
b79bd2867f Merge "Thread.sleep takes milliseconds, not seconds." 2021-01-26 23:36:05 +00:00
Benedict Wong
44192ee464 Prep VCN files for exposing APIs
Add @hide to methods to clearly show what is being exposed and cleanup
some visibilty/final modifiers.

Bug: 168833866
Test: atest FrameworksVcnTests
Test: atest android.net.vcn
Change-Id: I8e03133053b59fd5b8df640e4b22761f572f9548
2021-01-26 15:28:24 -08:00
Hall Liu
b6622aeeb6 Merge "Correct name of roaming RTT config" 2021-01-26 22:26:56 +00:00
Treehugger Robot
d7bac025fb Merge "Add app hibernation service stubs" 2021-01-26 22:23:13 +00:00
Treehugger Robot
dd438b73cc Merge "Add enforcement parameter to RequiresFeature" 2021-01-26 22:03:53 +00:00
Daniel Bright
dd7a9031eb Add S-NSSAI
* Added support for S-NSSAI
* Created SliceInfo that represents a S-NSSAI as defined in
  3GPP TS 24.501.
* Added slice info to setupDataCall and DataCallResponse within
  DataService related classes

Bug: 169960538
Test: made ims phone call
Change-Id: I8f136937f127ff14fedd790526544d5775010da8
Merged-In: I8f136937f127ff14fedd790526544d5775010da8
2021-01-26 13:53:58 -08:00
James Mattis
df956539b9 Multilayer request updates to request callbacks
Updated to ConnectivityService to support multilayer requests when
sending request level callbacks.

Bug: 174797702
Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I3d6896f5705509bcfff5544d2eb13c31feaf1937
2021-01-26 12:33:43 -08:00
James Mattis
24ee9262b6 Multilayer support when NAI requests are updated
Updates to ConnectivityService to support multilayer requests in any
flows which a NetworkAgentInfo has a NetworkRequest added/removed. This
would include both 'listen' and 'request' types of NetworkRequest
objects.

Bug: 174271773
Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Iaff727e792828684e6ad4d07d0081e27992031be
2021-01-26 12:33:37 -08:00
Treehugger Robot
ad1dde5594 Merge "Set OWNERS for core/java/android/app/VoiceInteractor" 2021-01-26 20:24:04 +00:00
Daniel Bright
109454a1f9 Add enforcement parameter to RequiresFeature
* Allows for a broader range of enforcement checks
* Designed to match androix so that it can be easily slotted into
Android Studio lint checks

Test: Built
Bug: 173735303
Change-Id: Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845
Merged-In: Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845
2021-01-26 12:20:32 -08:00
Treehugger Robot
3525be2175 Merge "Add visibility for new location of permission apex." 2021-01-26 19:13:05 +00:00
Hall Liu
7a18070979 Correct name of roaming RTT config
Add _bool to the end

Bug: 168676696
Test: manual
Change-Id: Ifa14d742d40a585ecc1e041088f49aa5d13df07b
2021-01-26 10:51:11 -08:00
Treehugger Robot
4ddafbf58f Merge "Add toddke to owners for system server" 2021-01-26 18:11:44 +00:00
Todd Kennedy
b285d2ff2c Add toddke to owners for system server
Change-Id: I16251c6d90d676b3baf8163b53f584c7134697dc
2021-01-26 16:36:18 +00:00
Janis Danisevskis
a7303378bc Keystore 2 SPI: Fix KeyStorePublicKey getEncoded().
AndroidKeyStorePublicKey now returns the encoded key instead of the
encoded certificate.

Test: Keystore CTS tests.
Bug: 178456047
Change-Id: I2c9b44bd13c702545b33ed0fb4c7e802c13851f6
2021-01-26 08:14:00 -08:00
Treehugger Robot
2338a4df6b Merge "CEC : Add test to check ARC status" 2021-01-26 16:02:37 +00:00
Treehugger Robot
0d72e983ce Merge "Change order of owners." 2021-01-26 15:16:45 +00:00
David Zeuthen
40d6635701 Merge "Identity Credential: API changes for Android 12" 2021-01-26 14:50:27 +00:00
Baligh Uddin
d4a52c97ee Add visibility for new location of permission apex.
This is prep. work for f/b/apex/permission migraton to
packages/modules/Permission.  The Build System does not
enforce location checks within visibility, which allows
us to add the new location post migration and ensure
migration process does not run into visibility related errors.

BUG: 167963264
Test: TH
Change-Id: I765b73bb8e0f377ef03805423807e720f1e90582
2021-01-26 13:50:56 +00:00
Corina
911c2e8bed Change order of owners.
Some tools use the first owner as default assignee for automatically
file bugs.

Bug: no
Test: no
Change-Id: Iad216857e9b8de705a4a0c4f09389a0efe7aca18
2021-01-26 13:31:56 +00:00
Treehugger Robot
3795a7d1d2 Merge changes I713bc2ec,Ib9ab07c9
* changes:
  [FUI05] Remove wimax data usage unit test
  [FUI14] Get SSID from NetworkCapabilities
2021-01-26 13:13:24 +00:00
Andrei-Valentin Onea
d500b8afd6 Merge "Improve flakiness of PlatformCompatGating test" 2021-01-26 12:36:58 +00:00
Yo Chiang
cc0ece4108 Merge "Fix dynsystem.BootCompletedReceiver" 2021-01-26 10:58:02 +00:00
Yo Chiang
7b84f49b41 Merge "Remove feature flag "settings_dynamic_system"" 2021-01-26 10:53:54 +00:00
Benedict Wong
bd65203feb Merge "Remove usage of NetworkInfo" 2021-01-26 06:49:32 +00:00