Commit Graph

385170 Commits

Author SHA1 Message Date
Lorenzo Colitti
4547d8f2db Merge "Add validation type definition to support multiple probe result"
am: 3bdd969ff7

Change-Id: Iad7e1577483bde7e7525943849ec2f91d4d1bfd7
2019-04-26 03:49:26 -07:00
Lorenzo Colitti
3bdd969ff7 Merge "Add validation type definition to support multiple probe result" 2019-04-26 10:32:19 +00:00
Lorenzo Colitti
57646109fd Merge "Make DNS cache lifecycle management explicit"
am: a6d5664819

Change-Id: Ie97fe453c89476915f3b362b6486c7d4608da2a9
2019-04-25 17:38:23 -07:00
Lorenzo Colitti
a6d5664819 Merge "Make DNS cache lifecycle management explicit" 2019-04-26 00:23:22 +00:00
Pengquan Meng
6f7ccba005 Merge "Fixed the comment of carrier config for CDNR"
am: e994a0d66a

Change-Id: I33dddc12e64b681e23e5600ab4a1c9cf560f795b
2019-04-25 15:18:45 -07:00
Pengquan Meng
e994a0d66a Merge "Fixed the comment of carrier config for CDNR" 2019-04-25 22:07:25 +00:00
Pengquan Meng
b4a53fdb9e Fixed the comment of carrier config for CDNR
Bug: 122921456
Test: build
Merged-In: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
Change-Id: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
(cherry picked from commit 7ac9a8f314)
2019-04-25 11:23:27 -07:00
Chiachang Wang
f914b77414 Add validation type definition to support multiple probe result
In order to allow NetworkMonitor to tell ConnectivityService
if the network is either parital, validated or both.
NetworkMonitor could update the probe result by passing the
bitmask to ConnectivityService.

Bug: 130078798
Bug: 130683832
Test: build
Change-Id: I429ccbd9b9afae3eafaf73b3c9eb835213c1f64d
2019-04-25 16:03:43 +00:00
Chiachang Wang
a4527d568f Merge "Remove Settings constants for NetworkStack"
am: d32d766a04

Change-Id: Icba412d89c10a64d7e5d3d396b6a1364f7ad6bc5
2019-04-24 22:05:10 -07:00
Chiachang Wang
d32d766a04 Merge "Remove Settings constants for NetworkStack" 2019-04-25 04:49:04 +00:00
Chiachang Wang
ed6bc570af Merge "Update exception type thrown when NetworkStack is missing"
am: fb60c85219

Change-Id: Icbf7db83d73a1912573e71c71f694f2d37d788af
2019-04-24 21:19:45 -07:00
Chiachang Wang
fb60c85219 Merge "Update exception type thrown when NetworkStack is missing" 2019-04-25 03:48:52 +00:00
Chiachang Wang
e6d0ab916a Remove Settings constants for NetworkStack
The definitions reference of these constants are moved from
Settings to DeviceConfig. These definitions are @hide and the
usage in the Settings are removed. Thus, remove the definitions
from API level.

Bug: 123167629
Test: make system-api-stubs-docs-update-current-api \
      test-api-stubs-docs-update-current-api
Test: atest NetworkStackTests
Change-Id: I28c4bf2c0b72e154cea91d11007a9497c7f21570
Merged-In: I7291cfa86cd6e907df35e8fbc97e2e9a77e56cab
Merged-In: Ic48bea07e79490dd3787068bc88c748525752a61
2019-04-25 02:40:51 +00:00
Lorenzo Colitti
bfac8ddcc5 Merge "Add privapp permissions to network modules."
am: f11bd352b4

Change-Id: Iebd6224cb61bd35dd6cb6470cb4ac3ad0f1eced7
2019-04-24 19:19:33 -07:00
Lorenzo Colitti
f11bd352b4 Merge "Add privapp permissions to network modules." 2019-04-25 02:05:19 +00:00
Leland Miller
3e2e2d66ce Merge "Use injected instance of RcsControllerCall"
am: f545515ee6

Change-Id: Id364fe89943027eb1ec9f60b7457126ff8945b16
2019-04-24 17:15:18 -07:00
Treehugger Robot
f545515ee6 Merge "Use injected instance of RcsControllerCall" 2019-04-24 23:48:40 +00:00
Jordan Liu
15df31ba43 Merge "Do not populate SLOT_KEY with wrong slot info"
am: b3fded4d17

Change-Id: Idf9900e5201c242651e1491235bdeaced4ec8292
2019-04-24 16:18:34 -07:00
Jordan Liu
b3fded4d17 Merge "Do not populate SLOT_KEY with wrong slot info" 2019-04-24 23:04:25 +00:00
Jordan Liu
dd50042fb8 Do not populate SLOT_KEY with wrong slot info
The slotId is not necessarily the phoneId, so do not broadcast as if it
is. SLOT_KEY is a hidden extra so this should not impact apps in general
(if they need the old extra they can still use the hidden PHONE_KEY).

For select broadcasts like SIM_CARD_STATE_CHANGED, we will manually
populate the slot key. This is a temporary solution to b/130664115 and
we should eventually review and consider making the SLOT_KEY public for
some broadcasts.

Bug: 130664115
Test: manual
Change-Id: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
Merged-In: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
2019-04-24 13:50:56 -07:00
SongFerng Wang
a788bd9308 Merge "Add 5G evolution icon"
am: 8442966df9

Change-Id: I9f8d0a708ab5f958c6ceb0ce67cd812298db415b
2019-04-24 09:54:21 -07:00
SongFerng Wang
8442966df9 Merge "Add 5G evolution icon" 2019-04-24 16:41:14 +00:00
Lorenzo Colitti
ef68d77b4b Merge "Make the network stack a persistent process."
am: d0e7befaaf

Change-Id: I7de9d01aa2ee0d71f7c862e530d86b4a136013a6
2019-04-24 09:37:50 -07:00
Treehugger Robot
d0e7befaaf Merge "Make the network stack a persistent process." 2019-04-24 16:25:24 +00:00
SongFerngWang
f07d64bdc9 Add 5G evolution icon
This add the 5GE icon to the system UI for specific carriers
LTE CA network.

Bug: 124768697
Test: build & manually test:
fake the operator name with pattern, and check the status bar data icon.

Change-Id: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
Merged-In: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
2019-04-24 23:03:29 +08:00
Rubin Xu
39c2091c88 Merge "Remove unused methods from INetworkManagementService"
am: 5d2c5d5dc2

Change-Id: Ie37c9c751830d209d40772bd2d410a9c550236cd
2019-04-24 07:43:27 -07:00
Treehugger Robot
5d2c5d5dc2 Merge "Remove unused methods from INetworkManagementService" 2019-04-24 14:29:39 +00:00
Lorenzo Colitti
6c13b4e0f4 Add privapp permissions to network modules.
When built as part of the system, the network stack and the
captive portal login app should have the BYPASS_PRIVATE_DNS
and CONNECTIVITY_USE_RESTRICTED_NETWORKS permissions.
These are necessary to validate restricted networks, bypass VPNs,
bypass private DNS for captive portal login, etc. Add these
permissions to privapp-permissions-platform.xml.

When installed as mainline modules that cannot use signature
permissions, the modules get this ability by virtue of having the
MAINLINE_NETWORK_STACK permissions.

Additionally, add the CONNECTIVITY_USE_RESTRICTED_NETWORKS
permission to the captive portal login app manifest, which did
not contain it.

Bug: 129789428
Test: builds, boots
Test: dumpsys package shows permissions
Change-Id: I632359f7eff09fed71167733ac75824a5aa57894
2019-04-24 23:13:29 +09:00
Chiachang Wang
79bc7e28a9 Update exception type thrown when NetworkStack is missing
rethrowFromSystemServer is throwing DeadSystemException which
is different from the original log message. Thus, update the
way to rethrow the same RemoteException.

Bug: 130028724
Test: atest FrameworksNetTest
Test: Kill NetworkStack and check the log message
Change-Id: I60862e276dd4e2d143278b272a9ba54219acce26
2019-04-24 13:59:50 +00:00
Lorenzo Colitti
796afddd6c Make the network stack a persistent process.
The network stack should never be killed, because if it does,
recovering networking requires a reboot. Make the process
persistent to reduce the chances of it being killed by the OOM
killer.

Bug: 131046856
Test: builds, boots
Test: process oom_score_adj is -800
Test: process goes from "Persistent Service" to "Persistent" in dumpsys meminfo
Change-Id: Ic8ebf6356e23489f6cd984d680ff9f1b4cbbe52d
2019-04-24 22:36:55 +09:00
Neil Fuller
78ccbc3bec Merge "Switch to HexEncoding from ByteStringUtils"
am: 6badf7c7da

Change-Id: I0af52cb2289e1df89ac65fa01334d4e9de69e010
2019-04-24 06:08:15 -07:00
Neil Fuller
6badf7c7da Merge "Switch to HexEncoding from ByteStringUtils" 2019-04-24 12:57:25 +00:00
Lorenzo Colitti
15b57501ab Merge "Delete unused timeout constant."
am: 1439bbb6d5

Change-Id: I341540745196f1d23fb95263a8948561cdfa4c8e
2019-04-24 02:57:48 -07:00
Rubin Xu
89213aa483 Merge "Reinstate new VPN uid filtering unit tests"
am: 554a15d5ea

Change-Id: Ib76c2cf319377141a374b3bdcf5e6606aaf9c06b
2019-04-24 02:53:44 -07:00
Treehugger Robot
1439bbb6d5 Merge "Delete unused timeout constant." 2019-04-24 09:44:14 +00:00
Treehugger Robot
554a15d5ea Merge "Reinstate new VPN uid filtering unit tests" 2019-04-24 09:37:49 +00:00
Lorenzo Colitti
11aaadd6ae Delete unused timeout constant.
Test: m
Bug: 129312219
Change-Id: I5b4c8b42dea515f674ff10d64d0e1d06d849cca1
2019-04-24 17:11:12 +09:00
Leland Miller
728f0e4927 Merge "Create new RcsMessageQueryResultParcelable"
am: 6af6e3a4f6

Change-Id: Id86442efa84f9c2ed49dc362f4a17466851dacfe
2019-04-23 23:30:26 -07:00
Treehugger Robot
6af6e3a4f6 Merge "Create new RcsMessageQueryResultParcelable" 2019-04-24 06:12:47 +00:00
Aaron Huang
cab3f447ae Merge "Move NattKeepalivePacketData out of the framework"
am: 833edcbb1b

Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08
2019-04-23 21:17:26 -07:00
Aaron Huang
833edcbb1b Merge "Move NattKeepalivePacketData out of the framework" 2019-04-24 04:00:56 +00:00
Tyler Gunn
d60707b4ea Merge "Update API docs for country ISO APIs."
am: 990053e552

Change-Id: Id27a49ca6f817be0c7b358e0cce562ee17dfff69
2019-04-23 14:49:19 -07:00
Tyler Gunn
990053e552 Merge "Update API docs for country ISO APIs." 2019-04-23 21:40:12 +00:00
Pengquan Meng
9bc0b85dae Merge "Add carrier display name related CarrierConfig"
am: 570f5dcae1

Change-Id: I8162117716296d3e707a192e4b61dc5fb3727fee
2019-04-23 13:39:26 -07:00
Pengquan Meng
570f5dcae1 Merge "Add carrier display name related CarrierConfig" 2019-04-23 20:23:20 +00:00
Christopher Ferris
df4acb4d8c Merge "Move to android_mallopt for malloc debug calls."
am: aba4de21e0

Change-Id: Ibd755a60e862ff6db869bc412145d0058b9f7d41
2019-04-23 11:03:08 -07:00
Christopher Ferris
aba4de21e0 Merge "Move to android_mallopt for malloc debug calls." 2019-04-23 17:45:01 +00:00
Jack Yu
480903bbcb Merge "Fixed that emergency alert dialog not popped up"
am: 4da7f91b23

Change-Id: Iba1c3d277171a1727953509438d3cabacb9c45cb
2019-04-23 10:21:10 -07:00
Rubin Xu
9e64dc05d2 Reinstate new VPN uid filtering unit tests
Mock out PackageManager and returns correct information corresponding
to the test app package itself.

Test: atest --generate-new-metrics 10 com.android.server.ConnectivityServiceTest
Bug: 114231106
Bug: 130397860
Change-Id: Ib921700eda417f411d7a2c77c1140fba9ab50bbb
2019-04-23 18:04:14 +01:00
Jack Yu
4da7f91b23 Merge "Fixed that emergency alert dialog not popped up" 2019-04-23 16:57:04 +00:00