Commit Graph

439526 Commits

Author SHA1 Message Date
Yan Yan
a32fcb74e5 Merge "Add module IPsec(IKE) stubs and sources to platform" 2020-01-14 18:17:24 +00:00
Meng Wang
52cc4a4321 Merge changes Iec082f0c,I86a479af
* changes:
  telephony/common/* should use android.util.Log
  Use com.android.telephony.Rlog for mainline module.
2020-01-14 18:06:22 +00:00
Brad Ebinger
6408fa473f Merge "Add new @SystemApis for RCS dependencies" 2020-01-14 17:31:36 +00:00
Aaron Huang
3516f5853a Merge "Make NattKeepalivePacketData @SystemApi" 2020-01-14 14:36:09 +00:00
Treehugger Robot
c674b05757 Merge "Use new UnsupportedAppUsage annotation." 2020-01-14 13:50:12 +00:00
Maciej Żenczykowski
73cab34d9f Merge "minor change to keep it building" 2020-01-14 09:03:11 +00:00
Betty Chang
9f48bdc383 Merge "[Telephony Mainline] Add new SystemApi method and SystemApi annotation for mainline" 2020-01-14 06:19:49 +00:00
Lorenzo Colitti
03c1364b16 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" 2020-01-14 05:30:14 +00:00
Mark Chien
55962277bf Merge "Add NETWORK_STACK_SERVICE to SystemServiceRegistry" 2020-01-14 04:17:20 +00:00
Benedict Wong
7f58c0d848 Add module IPsec(IKE) stubs and sources to platform
As IKE is used in the frameworks for IKEv2/IPsec VPNs, IKE stubs
must be built and added to the frameworks build process

Bug: 147096727
Test: build, flash, boot
Test: FrameworksNetTests, FrameworksIkeTests passing
Change-Id: I51aad4ab800442d018bb170225c114a4ae5ea3b1
(cherry picked from commit 589b6ffe7c)
Merged-In: I51aad4ab800442d018bb170225c114a4ae5ea3b1
2020-01-13 20:16:56 -08:00
Treehugger Robot
b90330ea86 Merge "Convert apct/telephonycomm/all_unit_tests to Test Mapping Suite." 2020-01-14 02:41:10 +00:00
Remi NGUYEN VAN
fe1ce1e047 Add NETWORK_STACK_SERVICE to SystemServiceRegistry
The service is already registered in ServiceManager. It needs to be
accessible from SystemServiceRegistry so that other mainline modules
can communicate with it.

Bug: 147255753
Test: Dependent CLs using the service
Change-Id: I940c62064466c3b3b8d2a195b810e90eaade7e6c
Merged-In: I940c62064466c3b3b8d2a195b810e90eaade7e6c
2020-01-14 02:17:54 +00:00
paulhu
4dc238b5e5 Expose ConnectivityManager#TYPE_NONE as SystemApi
Support wifi mainline module usage.

Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
      atest FrameworksNetTests
Change-Id: Ia496aaeaf74fa44764640fd2b97c417509e040aa
2020-01-14 10:02:30 +08:00
Treehugger Robot
bd7c75490e Merge "Update owners files with new team members" 2020-01-14 01:43:41 +00:00
Chiachang Wang
ba43c13e77 Merge "Support reevaluation request from captive portal app" 2020-01-14 01:42:22 +00:00
Yan Yan
c0f518b2d3 Merge "Make mainline IKE statically include Android StateMachine" 2020-01-14 00:10:01 +00:00
Chalard Jean
107fe4130e Merge "Add net-utils-framework-common-srcs to framework" 2020-01-14 00:09:22 +00:00
Brad Ebinger
70e9b70469 Merge "ims:rcs uce update" 2020-01-14 00:07:24 +00:00
Jeffrey Huang
e77476a9bb Update owners files with new team members
Test: N/A
Change-Id: I48dddae02c9c377f705094d9b58dbe3e2128ac7b
2020-01-13 23:51:27 +00:00
Allen Su
b1c730d069 Merge "[RCS] Add set/getRcsProvisioningStatusForCapability()" 2020-01-13 23:15:14 +00:00
Treehugger Robot
cc2956a0bd Merge "Expose sanitizeLocationInfo as SystemApi" 2020-01-13 22:45:44 +00:00
Eric Laurent
41b4b849fc Merge "AudioEffect: add contructor for device effect" 2020-01-13 21:43:18 +00:00
Eric Laurent
4ea970a8ed Merge "AudioDeviceAddress: new class to store audio device information" 2020-01-13 21:42:59 +00:00
Eric Laurent
1eca4b7389 Merge "audiofx: add device descriptor to AudioEffect constructor" 2020-01-13 21:39:07 +00:00
Brad Ebinger
10327316a9 Add new @SystemApis for RCS dependencies
As part of mainline, remove telephony dependencies from RcsService
and PresencePolling apps.

Bug: 147319232
Test: atest CtsTelephonyTestCases
Merged-in: Id25bfffc1c40db8b183206dc598165272da7356c
Change-Id: Id25bfffc1c40db8b183206dc598165272da7356c
2020-01-13 13:38:07 -08:00
Treehugger Robot
93db49faec Merge "Add Callback for Registration Failure" 2020-01-13 20:58:00 +00:00
Neil Fuller
49c903a0d2 Merge "Make NtpTrustedTime safer / expand docs" 2020-01-13 20:19:11 +00:00
Neil Fuller
99d116cbbb Merge "Remove android.telephony.action.NETWORK_SET_TIME" 2020-01-13 20:04:54 +00:00
Meng Wang
eef767427c telephony/common/* should use android.util.Log
Bug: 144374158
Test: make
Merged-In: Iec082f0c0256d4e8f9cdbb2ebaf7425227f2299c
Change-Id: Iec082f0c0256d4e8f9cdbb2ebaf7425227f2299c
2020-01-13 11:37:56 -08:00
Treehugger Robot
5212ff1bf3 Merge "Migrate legacy dhcp server config to DeviceConfig" 2020-01-13 19:12:25 +00:00
Aaron Heuckroth
edabed7fb7 Merge "Change layout of ToggleAction for GlobalActionsDialog" 2020-01-13 18:45:05 +00:00
Meng Wang
6d3e821058 Use com.android.telephony.Rlog for mainline module.
Bug: 144374158
Test: make
Merged-In: I86a479affb8e0fa8e48734324a6a05c68230d910
Change-Id: I86a479affb8e0fa8e48734324a6a05c68230d910
2020-01-13 10:32:55 -08:00
Treehugger Robot
ab9527a44b Merge "Replace setCapability usage in Tethering" 2020-01-13 17:56:25 +00:00
Aaron Huang
8e5e8c9815 Make NattKeepalivePacketData @SystemApi
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests

Change-Id: I687f1a8a4b82cb7e4a0dfeb24f0b23a4de6d5287
2020-01-14 01:45:28 +08:00
Mark Chien
2a27a6ade1 Merge "Add config_tether_* and entitlement resources" 2020-01-13 17:19:02 +00:00
Calvin Pan
2d83e92bbd Merge "[Telephony Mainline] Add new api for Mvno matching" 2020-01-13 16:54:50 +00:00
Neil Fuller
845146b012 Make NtpTrustedTime safer / expand docs
This commit makes a number of changes:
1) Documents / enforces thread safety, removes or deprecates unsafe
check-then-do methods / adds a way to get the NTP query result
atomically.
2) Delays configuration lookup until point of use: the config can change
due to various possible config overlays, e.g. MCC-based config.

(1) is because the threading model is currently unclear / possibly
unsafe - it looks like NtpTrustedTime is supposed to be single threaded
but it's also a singleton so could be accessed from multiple threads.
If NtpTrustedTime were not a singleton things might be easier but the
@UnsupportedAppUsage makes it difficult to change now.
(2) is to address the same issue as https://r.android.com/1182530,
contributed by Luca Stefani.

Bug: 140712361
Test: build only
Merged-In: Ie09da9db5d853b59829886a020de21a88da5dd51
Change-Id: Ie09da9db5d853b59829886a020de21a88da5dd51
(cherry picked from commit 65f0f31bde)
2020-01-13 16:54:14 +00:00
markchien
5e50b948d2 Replace setCapability usage in Tethering
Bug: 147413518
Test: build, flash, boot
Change-Id: I7abec2d7cf03d0675749e8379d624504ceb3d9af
2020-01-13 23:34:20 +08:00
Aaron Huang
c4081b2898 Add net-utils-framework-common-srcs to framework
Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest NetworkStaticLibTests
      atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ic7b5b07f0e95068eb53f54ced1fbc52743a7a5cd
2020-01-13 23:33:35 +08:00
Treehugger Robot
e57a8f338f Merge changes I5f425928,I397d361f
* changes:
  Define stubs_defaults for the new API surfaces
  Add SystemApi params to framework-module defaults
2020-01-13 15:31:42 +00:00
Treehugger Robot
f828b6c71d Merge "Add API stubs for module APIs" 2020-01-13 15:11:28 +00:00
markchien
2dfee023c9 Migrate legacy dhcp server config to DeviceConfig
Legacy dhcp server can also be enabled by resource config.

Bug: 144814607
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I8ae5fa3d5bbd88129bd0890f71be6f8a1bfec0eb
2020-01-13 15:07:03 +00:00
markchien
dcc69629f1 Add config_tether_* and entitlement resources
Copies config_tether_* and entitlement resources from
framework/base/core/res to tethering package. Will have
follow up changes to move overlay and switch tethering to
use this internal resource. duplicated resource in framework
will be removed after fixing all of users(e.g. test, TetherUtil,
Settings, ....).

Bug: 147399354
Test: build

Change-Id: I2a77e5070d53566d5ec3697358a6dbbebb4ff59f
2020-01-13 15:03:11 +00:00
Treehugger Robot
a5dd35d6c0 Merge "mainline:Replace serviceState.getDataRegState and getVoiceRegState" 2020-01-13 14:45:28 +00:00
Treehugger Robot
b2c3eaaf10 Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 14:27:29 +00:00
Junyu Lai
432f29f770 Merge changes from topic "sp04"
* changes:
  [SP05] add unit test for onStatsProviderLimitReached in NPMS
  [SP04] add unit test for NetworkStatsProvider
  [SP03] support registerNetworkStatsProvider API
  [SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
2020-01-13 14:09:52 +00:00
Treehugger Robot
89ac95017f Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:35:38 +00:00
satayev
e1432f59ee Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:09:36 +00:00
Treehugger Robot
9938c70fb5 Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:05:17 +00:00
Treehugger Robot
70a89435e7 Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:04:48 +00:00