Commit Graph

561084 Commits

Author SHA1 Message Date
Lorenzo Colitti
8c93a76901 Merge changes Idfb5e149,Ia52b24c5
* changes:
  Stop using NetworkState internally in ConnectivityService.
  Isolate an ad-hoc legacy API codepath.
2021-03-03 05:35:28 +00:00
Yo Chiang
0fb5c3f306 Merge "DSUService: stopSelf() only if no ongoing installation" 2021-03-03 05:11:10 +00:00
Chilun Huang
c8677e4d05 Merge "Add ownership for ConfigurationController" 2021-03-03 03:41:39 +00:00
Andy Hung
2c27a78902 Merge "Add AudioMetadata keys related to active audio presentation" 2021-03-03 02:37:13 +00:00
Paul Hu
56b1b24940 Merge "Replace ConnectivityManager hidden symbols on SettingsLib" 2021-03-03 02:15:22 +00:00
Frank Li
f2781e9b3c Merge "[REIP01]Remove the IP connectivty metrics" 2021-03-03 01:28:31 +00:00
Paul Hu
a476ef4d57 Merge "Use IDnsResolverUnsolicitedEventListener" 2021-03-03 01:08:27 +00:00
Paul Hu
18a60acfdf Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" 2021-03-03 01:07:20 +00:00
Hall Liu
bff8389872 Merge "Expose ApnSetting#TYPE_*_STRING constants" 2021-03-02 23:20:15 +00:00
Hall Liu
b8cc532986 Merge "Expose the carrier signaling broadcasts" 2021-03-02 22:54:18 +00:00
Treehugger Robot
1e8b0527b5 Merge "Add QoS filter matching and unit tests" 2021-03-02 22:39:09 +00:00
Hall Liu
39087a439e Expose the carrier signaling broadcasts
Expose broadcasts for communicating certain changes in state between
Telephony and carrier apps.

Implement a backward-compatibility layer to support carrier apps
targeting <=R that are listening to the old hidden broadcasts.

Fixes: 173050428
Test: atest CarrierSignalTest CarrierSignalAgentTest
Change-Id: I15d032ee1e31d9be847c2f084161f8555c8172c1
Merged-In: I15d032ee1e31d9be847c2f084161f8555c8172c1
2021-03-02 13:38:53 -08:00
Tyler Gunn
c90335033b Merge "CallDiagnosticService API" 2021-03-02 21:33:02 +00:00
Jayachandran C
82984a8ca1 Add QoS filter matching and unit tests
Bug: 158315614
Test: atest com.android.internal.telephony.dataconnection.QosCallbackTrackerTest

Merged-In: I7d6d66eba5612182703826b60b4d735230572eea
Change-Id: I7d6d66eba5612182703826b60b4d735230572eea
2021-03-02 13:31:26 -08:00
Hall Liu
dee1a5ad8c Expose ApnSetting#TYPE_*_STRING constants
Expose these string representations of APN types as SystemApi, and add
utility methods to convert between these and their integer equivalents.

Fixes: 173133122
Test: atest ApnSettingTest TelephonyRegistryTest
Change-Id: I8095ebc4f766be52042eec1c8ee043bf2e2dabfb
Merged-In: I8095ebc4f766be52042eec1c8ee043bf2e2dabfb
2021-03-02 13:25:47 -08:00
Andy Hung
1e21d8530b Merge "AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE" 2021-03-02 20:07:50 +00:00
Evan Severson
391145ab85 Merge "Update permissions OWNERS files" 2021-03-02 19:46:59 +00:00
Treehugger Robot
61ff46fee0 Merge "add to owners" 2021-03-02 19:27:46 +00:00
Hui Wang
a340c35a86 Merge "Notify rcs config as needed when RCS service ready" 2021-03-02 19:20:38 +00:00
Hui Wang
3727cc1834 Merge "Support telephoy command to set test mode for RCS single registration" 2021-03-02 19:20:38 +00:00
Jeff Sharkey
41a4f1e44c Merge "Add to owners" 2021-03-02 18:55:23 +00:00
Todd Kennedy
27cc2cecda Add to owners
Change-Id: Ib4f60234f2633f954ab86f7dbf6c21439ee5b24d
2021-03-02 18:38:57 +00:00
Evan Severson
13fd14252b Update permissions OWNERS files
Test: None
Change-Id: I039bf12c65b0cd509a6772d89b96821b98ff318c
2021-03-02 10:37:41 -08:00
Sally Yuen
d379746bb9 Merge "Add OWNERS for A11yInteractionController and accessibility core tests" 2021-03-02 18:25:16 +00:00
Yan Yan
8c7f74fa35 Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" 2021-03-02 18:24:27 +00:00
Sally
ce20fed9b5 Add OWNERS for A11yInteractionController and accessibility core tests
Bug: n/a
Test: n/a
Change-Id: Ie20914b3be604e9908ea25746575b041682ee1c7
2021-03-02 17:51:26 +00:00
Jeff Sharkey
b0a8269167 Merge "Create new directory to move ServiceWatcher into" 2021-03-02 16:41:49 +00:00
Abhijeet Kaur
14f35d5f2d Merge "Removed unused mount mode constants" 2021-03-02 16:37:30 +00:00
Soonil Nagarkar
b5d0dfc47b Create new directory to move ServiceWatcher into
Test: n/a
Change-Id: I0bfb68976025b1e9bbd56e038ed981db19bc6c4c
2021-03-02 08:14:52 -08:00
Treehugger Robot
4dd42cdd5f Merge "[FUI09] Expose NetworkStateSnapshot as system API" 2021-03-02 16:08:03 +00:00
Lorenzo Colitti
1881ae0342 Stop using NetworkState internally in ConnectivityService.
NetworkState is used by many methods that take or return legacy
network types. It is used because it contains most of the state
related to a network.

This code is not easy to follow and is more expensive than it
needs to be: most of the methods that construct a NetworkState
only really need one of its members (e.g., LinkProperties, or
NetworkInfo), but constructing a NetworkState requires making
defensive copies of all its other members as well.

- Instead of using NetworkState, use NetworkAgentInfo, which
  already contains all the same data.
- Replace calls to getUnfilteredActiveNetworkState with calls to
  getNetworkAgentInfoForUid. When getUnfilteredActiveNetworkState
  returned NetworkState.EMPTY, return a null nai, which causes
  any caller to see return null LinkProperties/NetworkInfo/etc.
- Rename filterNetworkStateForUid to getFilteredNetworkInfo,
  because that's the only thing it actually filters.
- Rename getFilteredNetworkInfo to getFilteredNetworkInfoForType
  to avoid having two methods with the same name perform two
  different operations. That method was only introduced recently
  in aosp/1552503, so it's probably fine to rename it.

Bug: 174123988
Test: passes existing ConnectivityServiceTest
Change-Id: Idfb5e149967266a442b268de6f13a521884dbb8f
2021-03-03 01:02:45 +09:00
Lorenzo Colitti
2d23f53029 Isolate an ad-hoc legacy API codepath.
The legacy API getNetworkInfo(int type) is expected to return
NetworkInfo objects for all network types supported by the device
even when those network types are not connected.

This requires a lot of fabrication because all the data
structures in ConnectivityService store information about
connected networks, not networks that don't exist.

Worse, the current behaviour is to return BLOCKED instead of
DISCONNECTED if background data is restricted. This obviously
makes no sense, because a disconnected network cannot be
blocked, and because if that network type did connect and was
unmetered (e.g., Wi-Fi), it would no longer be BLOCKED.
This complicates the code, forcing several methods to deal with
a special case of null NetworkCapabilities, no NetworkAgentInfo,
etc.

Fix this by isolating this outlandish behaviour to its own
method. This allows the main codepaths not to have to support
this unusual and not very useful edge case.

Bug: 174123988
Test: pure refactoring, passes existing tests
Change-Id: Ia52b24c59024c8f6e63e584b864e0225cb572090
2021-03-03 01:02:35 +09:00
junyulai
604fd08ca8 [FUI09] Expose NetworkStateSnapshot as system API
This is needed by NetworkStatsService and
NetworkPolicyManagerService to utilize the snapshots of
information of networks that grabbed from ConnectivityService.

Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I7e974ef7b23ba9ba6ee775eed9899b0c0e2eca55
2021-03-02 23:09:16 +08:00
Treehugger Robot
60faefffe9 Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" 2021-03-02 13:21:32 +00:00
junyulai
6b70436047 [FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot
This change migrates NetworkStatsService and related code to use
NetworkStateSnapshot which is used for replacing the NetworkState.

This patch also changes some formating which is suggested by
the linter.

Test: FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I547da8f411cb45bdadc376ac3cadf3f3c55bb282
2021-03-02 20:08:53 +08:00
Remi NGUYEN VAN
2e03331755 Merge "Move OemNetworkPreferences aidl to connectivity" 2021-03-02 09:29:07 +00:00
Remi NGUYEN VAN
5a81037576 Merge "Move UidRange to connectivity" 2021-03-02 09:27:50 +00:00
lifr
365307180a [REIP01]Remove the IP connectivty metrics
The IPconnectivty metrics was deprecated.
So, remove the usage of the IPconnectivty metrics code in android.

Bug: 157966864
Test: atest CtsNetTestCases
Change-Id: I9ed4d29bf868902f3222aff980758512233b0b0a
2021-03-02 09:03:28 +00:00
Treehugger Robot
588f3e84ab Merge "Add modules-utils-os to service-connectivity" 2021-03-02 08:59:35 +00:00
Treehugger Robot
e9baf825f1 Merge "Replace checkNetworkStackPermission in TestNetworkService" 2021-03-02 08:55:28 +00:00
Remi NGUYEN VAN
ae171d864d Merge "Move Proxy, PacProxySelector out of Connectivity" 2021-03-02 07:49:00 +00:00
Remi NGUYEN VAN
4eb9b18e02 Merge "Move SocketUtils out of the connectivity module" 2021-03-02 06:44:01 +00:00
Remi NGUYEN VAN
c983440dd8 Move UidRange to connectivity
UidRange is a data class that is an implementation detail of
Connectivity. Move it to the connectivity boundary.

Remaining usages of UidRange outside of Connectivity (in VPN) should be
migrated to other classes, like Range<Integer> or UidRangeParcel.

Bug: 181512874
Test: m
Change-Id: I6f2e3685ad1c07171dd90480d1e546329de8732d
2021-03-02 15:35:36 +09:00
Chiachang Wang
237d2d47a4 Merge "Revert "Expose NetworkRegistrationInfo.getNrState() as public API"" 2021-03-02 06:31:26 +00:00
Chilun
2ce64824e9 Add ownership for ConfigurationController
Bug: 127877792
Test: manual
Change-Id: I01b89191ef1b9c2bf82573b265ef2e04ce7acb18
2021-03-02 06:29:17 +00:00
Aaron Huang
93f749b245 Merge "Use the net-utils-device-common version of HexDump" 2021-03-02 06:25:34 +00:00
Andy Hung
6bb7c589b2 AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE
Test: atest AudioTrackTest#testTunerConfiguration
Bug: 181354677
Merged-In: I679c809ee8834c5a608243c353bc3a76ec55243c
Change-Id: I679c809ee8834c5a608243c353bc3a76ec55243c
2021-03-01 21:53:22 -08:00
Chiachang Wang
0d7553b30e Merge changes Ifc561b6d,I63137b24
* changes:
  Remove RouteInfo hidden depdendency in NMS
  Remove the hidden ConnectivityManager dependency in NMS
2021-03-02 05:13:22 +00:00
Remi NGUYEN VAN
f359b2d6cc Move OemNetworkPreferences aidl to connectivity
Move the IOnSetOemNetworkPreferenceListener aidl definition to
framework-connectivity.
The interface is an internal implementation detail of
framework-connectivity, so it should be built inside the jar.

Bug: 181512874
Test: m
Change-Id: I898049b50fc620ee629587a9303f058e0a6d0272
2021-03-02 13:56:38 +09:00
Lucas Lin
67ba0bc206 Merge changes I06ab0f2d,I8b146aa1
* changes:
  Use UserHandle#getIdentifier to get the userid
  Add test for getStartUser(), getEndUser() and createForUser()
2021-03-02 04:13:32 +00:00