Commit Graph

4266 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
cfab2e7015 Merge changes from topics "118348832", "120945564" am: 52a31598e7
am: 0c15f98874

Change-Id: I52fa7a18545f5e5bee64314cd47f8f6cb026f0a3
2019-02-11 16:13:42 -08:00
Malcolm Chen
77b2b559e1 Add API to handle user's subscription selection changes.
When user selects a eSIM subscription, Settings app informs Telephony.
Telephony needs to take actions such as writting it into global
settings, switch profiles and notify registrants, for example
AlternativeNetworkAccessService.

Bug: 120945564
Test: unittest
Change-Id: I846d9444aac368d183e06744c9eb8aa0c08dfe6a
Merged-In: I846d9444aac368d183e06744c9eb8aa0c08dfe6a
2019-02-07 17:42:34 -08:00
Youming Ye
f62df78690 Merge "Add connect time to conference participant." am: bd2016353c
am: 5ff42a7991

Change-Id: Ie88693e8ec940d9116c7ed459a44685e88e3aa88
2019-02-06 14:26:59 -08:00
Raman Tenneti
33a11bd0e3 Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
On 9/28 CL https://googleplex-android-review.git.corp.google.com/5116913 was checked into pi-dev. Merge was bad(couple of lines were lost during merge).

  https://b.corp.google.com/issues/35655737#comment34

Adding LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS and LOCK_SCREEN_SHOW_NOTIFICATIONS to SETTINGS_TO_BACKUP array. This fixes apct/framework/presubmit test failure.

Bug: 35655737
Bug: 118674794
Test: presubmit unit tests
Change-Id: I2e9cc95e8827e72ef3c09910d4d3e089bde375e5
Merged-In: I421c7487955ee339f88e3957c973375d0f87e2ff
2019-02-05 16:34:43 -08:00
Youming Ye
d6de26ea61 Add connect time to conference participant.
Bug: 78176188
Test: Manual
Change-Id: Ifb7f061ddcc69356a21d08c9c446edeb38a6674c
2019-02-04 10:14:49 -08:00
Pavel Grafov
2b996ad0dd Merge "Whitelist packages from VPN lockdown." am: 774c3ce152
am: b478bb25ac

Change-Id: I10094606f74e6cdc5f4b0b6591cf776fd895b1d3
2019-01-28 21:34:03 -08:00
Pavel Grafov
a462bcb9c4 Whitelist packages from VPN lockdown.
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Change-Id: I9119c139ab07a761ce5dfd1365b70eb905fd32dc
2019-01-25 19:59:03 +00:00
Dan Albert
fb54fde402 Merge "Revert "Whitelist packages from VPN lockdown."" am: 9f73671651
am: 2f94ef95c4

Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8
2019-01-24 13:58:15 -08:00
Dan Albert
ee8e6a0fae Revert "Whitelist packages from VPN lockdown."
This reverts commit bb9cef04c5.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68
2019-01-24 21:05:39 +00:00
Pavel Grafov
52e0e403d2 Merge "Whitelist packages from VPN lockdown." am: efc773525c
am: 295016b22b

Change-Id: I643fc2603f7cd2b928fe517eb473048004273835
2019-01-24 10:06:37 -08:00
Pavel Grafov
bb9cef04c5 Whitelist packages from VPN lockdown.
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Merged-In: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
2019-01-24 16:17:11 +00:00
Remi NGUYEN VAN
d0436c7114 Merge "Add NetworkMonitor constants to SystemApi" am: c3a6317b0b
am: 95b523ce8a

Change-Id: I0281ff981cbd5d26a2f2874db23244bebad9c66b
2019-01-21 19:25:05 -08:00
Remi NGUYEN VAN
7731c5bae2 Add NetworkMonitor constants to SystemApi
NetworkMonitor lives in the NetworkStack which must only use system
APIs. This includes constants used by NetworkMonitor and captive portal
login.

Bug: 112869080
Test: m
Merged-In: I8b5f0bb61c3ef0d2f33af7dd67b72ac6c5a1d1b5
Change-Id: I4879568d3fbf9435767c8d4d0ab5198d421a2f4f
2019-01-21 21:11:15 +09:00
Jayachandran Chinnakkannu
58a61cc734 Merge "Cellular data stall recovery based on networkStatus" am: 44631dfc26
am: e9dc415e2b

Change-Id: I2e381e9215a2d8f036a0de4f021573688250c142
2019-01-18 15:43:03 -08:00
Jayachandran C
8ef41bf34f Cellular data stall recovery based on networkStatus
This CL introduces cellular data stall recovery based on
network validation result. It still re-uses the existing
recovery steps but the triggers are based on networkStatus
from NetworkMonitor when the network is bad. Each recovery
step is spaced by a configurable grace period (default 3 mins)
to avoid back to back recovery.

This feature is controlled by the following settings. If this
feature is enabled then the legacy data stall detection based
on TrafficStats will automatically be disabled.

Settings.Global.DATA_STALL_RECOVERY_ON_BAD_NETWORK
1 => Enabled (default)
0 => Disabled

Settings.Global.MIN_DURATION_BETWEEN_RECOVERY_STEPS_IN_MS
3 minutes is default value

Bug: 113916551
Test: atest FrameworksTelephonyTests:com.android.internal.telephony.dataconnection.DcTrackerTest

Change-Id: I738fc7ed08803de1114f7a3d79bf278449e94ea8
2019-01-18 22:52:16 +00:00
Tyler Gunn
8089790805 Merge "Add CallerIdentification to CallScreeningService API." am: 6f37294f4c
am: 8657bc24e4

Change-Id: I158e7b8e1b1fd89e9c6e8f5f0c33b5c0e856b2cb
2019-01-15 08:53:35 -08:00
Tyler Gunn
d081f04bbe Add CallerIdentification to CallScreeningService API.
Updating the CallScreeningService to support passing call identification
information for incoming/outgoing calls.
Updating call log to log call identification information.

Bug: 63966743
Test: Manual with test app.
Merged-In: Ie6c172c09007eb5f4853d36ae0a99b782bfb5ddb
Change-Id: Ie6c172c09007eb5f4853d36ae0a99b782bfb5ddb
2019-01-11 11:26:48 -08:00
Xin Li
15b123ef45 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: Idc8bfb6d97a869b76cfb87ca1a494201baf9e8bd
2018-12-11 14:13:44 -08:00
Chiachang Wang
f720f0dbf8 Merge "Data stall detection using DNS event" am: 33fe80f927
am: 69b60f5a31

Change-Id: I35e7e81fa0d6db6527ea6dd606d00046df3b9818
2018-11-27 20:18:54 -08:00
Chiachang Wang
33fe80f927 Merge "Data stall detection using DNS event" 2018-11-28 03:53:30 +00:00
Chiachang Wang
7a70a7e0ed Data stall detection using DNS event
If dns resolver on a network get consecutively timeout then it
is a strong signal that the network is no longer usable.
Reevaluate the network once it's data stall suspected

Test: 1. runtest frameworks-net
      2. SettingsBackupTest passes
      2. Run on wifi w/o internet capability
Bug: 112653893, 113916551

Change-Id: I74287b174d933f97a91fa1529b1809856ac3b38d
2018-11-27 18:00:05 +08:00
David Brazdil
9d679cc5f7 Merge "Simplify HIDDEN_API_ENFORCEMENT_ flags" am: a37a1edd73
am: b28c0842e4

Change-Id: If4c99cfa79b9d8980044d5306e43c92b07aee1e6
2018-11-15 07:42:39 -08:00
David Brazdil
df1c7dc03d Simplify HIDDEN_API_ENFORCEMENT_ flags
Remove the distinction between pre-P and P apps and simplify the flags
to ENABLED, DISABLED and JUST_WARN.

Test: m
Merged-In: I87ef00a15ac9a3abfaeb011bbd8804b216f26c90
Change-Id: I31a6464bd95143e6242d043547a6a9ae8f9888bb
2018-11-14 16:49:42 +00:00
Tony Zhu
f922fb1375 Merge "[Call Screening]Logging of calls blocked by call blocking feature, call screening app." am: b5e8d45245
am: 20b0ca7ef8

Change-Id: Id2794379c6dd94bd5616ef0c86e6186324c33799
2018-11-08 10:07:13 -08:00
Tony Zhu
b5e8d45245 Merge "[Call Screening]Logging of calls blocked by call blocking feature, call screening app." 2018-11-08 17:22:43 +00:00
tonyzhu
9e1d4f86ba [Call Screening]Logging of calls blocked by call blocking feature, call screening app.
Add three call log entries, ALL_SCREENING_COMPONENT_NAME, CALL_SCREENING_APP_NAME,
BLOCK_REASON, and call block reasons. Add new parameter to get the
package name and component name of the implementation of CallScreenService.java.

Bug: 113243596
Test: Build pass
Change-Id: I63debd80d7f4a92278fdbb84b64ff1199591349c
2018-11-08 17:28:34 +08:00
Risan
729067376c Merge "Add a more flexible queryRecentDocuments" am: 627441218d
am: a366edd78d

Change-Id: Ib746205cd82634d0d7b821db94c8316e8260689c
2018-11-01 06:43:51 -07:00
Treehugger Robot
627441218d Merge "Add a more flexible queryRecentDocuments" 2018-11-01 13:11:09 +00:00
Risan
6a4a8f6046 Add a more flexible queryRecentDocuments
The existing queryRecentDocuments have a hard limit 64. However, case
like ARC++ wishes to have a more flexible limit that can be passed as an
extra parameter. This new API will gracefully degrade to the old API to
maintain backward compatibility with old providers.

Bug: 111288304
Test: manual test (patched the MediaDocumentsProvider, and test calling
the new API):
1. Test that passing Bundle with QUERY_ARG_LIMIT=5 is honored and
returned is limited to 5.
2. Test that passing null will release the limit to default 64.
3. Test that removing MediaProvider implementation for new method and
implement the old method will automatically redirect the call to old
method (backward compatible with old providers).

Change-Id: I37b1785b94f3e9cf09128fbf1e8779a4447fe7a9
2018-10-31 23:30:35 +00:00
sqian
5cfa939ba0 Merge "Change package to component for Setting's default call redirection service" am: f67ece13ad
am: a6bf55bcc6

Change-Id: Ia1d7455d2663c2942dfb298e9222e6c2b8d98529
2018-10-30 13:10:46 -07:00
Treehugger Robot
f67ece13ad Merge "Change package to component for Setting's default call redirection service" 2018-10-30 19:06:55 +00:00
weichinweng
aec23b71d6 Merge "Add CACHED_NAME into call history database when the add call." am: 568faa8ed9
am: 66d504697d

Change-Id: Iff5bc13cca9b35c311e05fa71b359702a4f9f556
2018-10-29 22:45:54 -07:00
Treehugger Robot
568faa8ed9 Merge "Add CACHED_NAME into call history database when the add call." 2018-10-30 04:44:35 +00:00
Tony Zhu
5b3b0ea44b Merge "[Call Screening]Default call screening app setting storage." am: 371786f6b0
am: 56b75cb498

Change-Id: I98ac08b917aef63202b006b7440bee4c75ff665f
2018-10-29 20:45:18 -07:00
sqian
28f8a2545d Change package to component for Setting's default call redirection service
Bug: 64959558
Test: Compile
Change-Id: I503b34812869e2b5897033ca765c85fcd4474101
2018-10-29 19:54:13 -07:00
Tony Zhu
371786f6b0 Merge "[Call Screening]Default call screening app setting storage." 2018-10-30 02:43:52 +00:00
tonyzhu
70526c3e95 [Call Screening]Default call screening app setting storage.
Add new string in Settings. To indicate which app is default
call screening, similar to default dialer application setting,
store this in the system settings provider.

Bug: 118416082
Test: atest SettingsBackupTest pass.
Change-Id: I39f81b31a68ee2dbb056ff935f8dea0f51720017
2018-10-26 13:40:45 +00:00
Chong Zhang
e8c39f3ba0 Merge "Color aspects keys information stored database" am: e4c918ba8e
am: 89c615866a

Change-Id: Ida5168cf1cea927dd79a9c2bacee0a156af60b76
2018-10-24 20:22:18 -07:00
nobuhiko saitou
839cc00889 Color aspects keys information stored database
Add keys for color aspects to VideoColumns in MediaStore.
And standard, transfer and range is stored to database.

Bug: 114329709
Test: put hdr/non-hdr contents and check media db

Change-Id: Id4bf27a35720f5cf5a60f08eb3f30314e1a1a167
2018-10-23 22:03:30 +00:00
weichinweng
fbb5f7b34c Add CACHED_NAME into call history database when the add call.
* For some carkit will get the call history name to show its screen, But
the caller name is not into call history database.
* Add caller name into call history database for the carkit get correct
caller name.

Bug: 111968310
Bug: 117627934
Test: build pass, verify pass, Check call history after received different
type call (save number, not save number, private number)
Change-Id: Ic28320c0184e33aa934a9c9c82a6062f5ef44e2a
2018-10-23 02:20:22 +00:00
sqian
846b2d1920 Merge "Add Call Redirection Default Application in Settings" am: b7c0727c15
am: 936791f536

Change-Id: Ibf6554de156ec0e4d7fa9dc46eb8eee216857188
2018-10-09 11:47:46 -07:00
sqian
936791f536 Merge "Add Call Redirection Default Application in Settings"
am: b7c0727c15

Change-Id: Iae885868a4e985822eac0e4134b16224ee8237f6
2018-10-09 11:36:25 -07:00
Treehugger Robot
b7c0727c15 Merge "Add Call Redirection Default Application in Settings" 2018-10-09 18:06:05 +00:00
sqian
97b6b00255 Add Call Redirection Default Application in Settings
Bug: 64959558
Test: compile
Change-Id: Iddac4d5b202db5a88aa82fd9ea4df89544b94b71
2018-10-08 16:38:41 -07:00
Kevin Hufnagle
8f4927c91c Merge "docs: Added callouts related to obsolete contacts data fields." into pi-dev
am: 568b5df03c

Change-Id: Ided398ed86868a0c71102911d040f7c98d6cffdb
2018-10-08 13:42:48 -07:00
Kevin Hufnagle
18b799e475 docs: Added callouts related to obsolete contacts data fields.
Also added callouts for fields that no longer sort results based on
contacts frequency.

Bug: 116422556

Test: make ds-docs -j32

Change-Id: I738e08bd4686e30b875fa37123ecebb4a5e179d3
Merged-In: Iddcd0b41b6ad991423a5ced78522a9ab2ad831a1
2018-10-08 09:40:51 -07:00
Leif Hendrik Wilden
bf1f2c455e Merge "Allow wifi and ethenet connected at same time." am: 54d34fe8a7
am: 1bceeaac85

Change-Id: I2b180336f74697ff5467c210eabccb4813ce317f
2018-10-02 11:06:14 -07:00
Leif Hendrik Wilden
1bceeaac85 Merge "Allow wifi and ethenet connected at same time."
am: 54d34fe8a7

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc
2018-10-02 10:57:11 -07:00
Treehugger Robot
54d34fe8a7 Merge "Allow wifi and ethenet connected at same time." 2018-10-02 17:09:16 +00:00
Jeff Sharkey
8fe3754f1a Merge changes from topic "bugfix_content_path" am: aa642187cd
am: f8ad474935

Change-Id: Ic5bbd68c327e6ad26ba3ddbd19ca5ea277396452
2018-10-01 11:40:25 -07:00