Commit Graph

4207 Commits

Author SHA1 Message Date
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
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
f8ad474935 Merge changes from topic "bugfix_content_path"
am: aa642187cd

Change-Id: Ice15a2cffcaf96a370f8e73ebe0a25bdea67f1c3
2018-10-01 11:25:38 -07:00
Jeff Sharkey
aa642187cd Merge changes from topic "bugfix_content_path"
* changes:
  Add OEM_SOUNDS_DIR variable
  Fix the bug that secondary storage path is judged as internal
  Revert "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
2018-10-01 17:49:03 +00:00
Leif Hendrik Wilden
fd30663181 Allow wifi and ethenet connected at same time.
This will improve the user experience on Android TV devices,
see bug for details.

In addition when connecting adb to the device by ethernet
for cts, wifi will not connect, causing lots of tests to fail.
For example:
[CTS7.1]android.net.wifi.cts.WifiInfoTest#testWifiInfoProperties
[CTS7.1]android.net.cts.ConnectivityManagerTest#testConnectivityChanged_
manifestRequestOnlyPreN_shouldReceiveIntent

Use command:settings to put global wifi_data_always_on 1 to enable it.

Bug: 26102779
Test: Manual, CTS.
Change-Id: I711d93061a6bc7164d98a858912f781e1b967406
2018-10-01 09:12:10 -07:00
Remi NGUYEN VAN
bc3c6b1314 Merge changes I0f997d30,I288ba1f4
am: 53f8591789

Change-Id: I8309074ba0744dee5789a2fe1f3b7e20bb3bc5b9
2018-09-30 19:53:29 -07:00
Remi NGUYEN VAN
e0d8c0e09e Enable new DHCP server by default
Regression tests pass with aosp/764042.

Test: regression automated tests, manual (verified WiFi, bluetooth
      tethering working).
Bug: b/109584964

Change-Id: I0f997d302a1d85930b24139af76e9b9c9a1b5f78
2018-09-28 12:43:47 +09:00
nobuhiko saitou
c39d08dd9c Fix the bug that secondary storage path is judged as internal
modifications to get right content uri.

Test: build

Change-Id: Ib441159387e512b85da6ffd47560efba8f20424e
2018-09-20 16:05:47 +09:00
Toshikazu Saito
fa733a62a9 Revert "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
This reverts commit 66eb589957.
This is reverted because SECONDARY_STORAGE is no longer used.

Test: build since this just removes unused part.
Bug: 79123178

Change-Id: I1748e8e1ac49bf5709908d85e3c0d26b43608500
2018-09-20 15:02:43 +09:00
Yuanjia Hsu
b04fcd5842 Merge "Add feature flag in Settings."
am: 55b91f6d93

Change-Id: I27aa24563358fe4467de3aa3660825f1d8bd73d5
2018-09-17 07:09:28 -07:00
yuanjiahsu
88363e9b2f Add feature flag in Settings.
User can enable/disable faster emergency phone call feature by switching
this flag from Settings, and the old flag switched by adb command was
replaced by this feature flag.

Test: Manually
Bug: 113539598
Change-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d
2018-09-11 15:04:51 +08:00
Remi NGUYEN VAN
0f78680ce2 Merge "Add global setting to use new DHCPv4 server"
am: 64dda3cf18

Change-Id: I3476e8e53247d086ca38e18c8713bb17396c6dfd
2018-08-28 23:40:02 -07:00
Remi NGUYEN VAN
64dda3cf18 Merge "Add global setting to use new DHCPv4 server" 2018-08-29 06:24:40 +00:00
Remi NGUYEN VAN
0597453f7c Add global setting to use new DHCPv4 server
The setting applies to the choice of DHCPv4 server for tethering.

Bug: b/109584964
Test: Still builds, SettingsBackupTest passes
Change-Id: Id9b5820883eaf3148f09ad948c34795b3619a30e
2018-08-28 17:47:04 +09:00
Tyler Gunn
0413689b87 Merge "Update BlockedNumberContract to indicate why a call was blocked."
am: a6d6bf816b

Change-Id: I03fb1c62380f8ae6de250f5cf907d75c6dc5f863
2018-08-22 14:22:22 -07:00
Tyler Gunn
a6d6bf816b Merge "Update BlockedNumberContract to indicate why a call was blocked." 2018-08-22 20:12:04 +00:00
Tyler Gunn
2b1be6b7c0 Update BlockedNumberContract to indicate why a call was blocked.
Previously only returned true/false. Now returning a status code indicating
why the call was blocked.

Bug: 63966743
Test: Manual, updated unit tests
Change-Id: I65ea52944f592fa789a27c5965a9ebe5e36be221
2018-08-20 13:45:36 -07:00
CY Cheng
0f7856add6 resolve merge conflicts of e58c780571 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d2feec990c23fb3536fc6b3e19c0b2696b81441
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352
2018-08-16 10:43:49 +00:00
Treehugger Robot
e58c780571 Merge changes I7122ff52,I1140fa41,If359662a
* changes:
  Fix Power menu background vanish
  Add separated emergency option on power menu
  Add emergency dialer option on power menu
2018-08-16 03:10:54 +00:00
Mathew Inwood
1b7a5028a0 Merge "Add @UnsupportedAppUsage annotations"
am: b558baa4cc

Change-Id: Id0ca3478dd2a29ded6ef0f8c8a9eabfe7a304449
2018-08-15 08:01:50 -07:00
Wesley.CW Wang
74b9579088 Add emergency dialer option on power menu
Add a button on power menu to launch emergency dialer.
Add FASTER_EMERGENCY_PHONE_CALL_ENABLED to SettingsBackupTest blacklist.

Test: Manually
Bug: 80376488
Change-Id: If359662a4d60dbe0ded89c3afe35db91dca4c445
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
2018-08-13 11:58:23 +08:00
Mathew Inwood
ba503117f4 Add @UnsupportedAppUsage annotations
For packages:
  android.providers.settings
  android.provider

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I993adf36dc31a5e224e88217c9e8dc140b6ba880
Merged-In: I3865ac184fcb6f52c6bfab9729611b065b27722e
2018-08-10 09:37:35 +01:00
Kevin Chyn
ecc07726e2 Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
am: a74fbef8ce

Change-Id: Ib14cc5a35991dec3623ecf2dfdb72cbbccd7e53e
2018-06-15 22:49:30 -07:00
Kevin Chyn
6df6b027f0 Don't back up Assist Gesture setup/sensitivity
Fixes: 72715022

Test: With two devices, set up one, back up onto the other.
      SUW for Assist Gesture does not get skipped
Test: atest SettingsBackupTest

Change-Id: Id7348542a618c0366f89c47833af6f66bf52b18f
2018-06-11 16:13:00 -07:00
Remi NGUYEN VAN
23d3487caa Merge "Add configurable captive portal probes" into pi-dev
am: 1f8f21af60

Change-Id: Iec7a74bbf2569a91e958c497200d77e8451cbf7b
2018-05-23 15:22:24 -07:00
Matthew Fritze
9a32638480 Merge "Add Settings Slice Whitelist key" into pi-dev
am: 1561bb41bd

Change-Id: Ic0843740958ff9e191f98220c3a80bf29a5e8251
2018-05-23 10:51:35 -07:00
Remi NGUYEN VAN
1f8f21af60 Merge "Add configurable captive portal probes" into pi-dev 2018-05-23 14:26:39 +00:00
Remi NGUYEN VAN
8255c2d6c2 Add configurable captive portal probes
The probes allow testing for a configurable status code and location
header (regexes). They are disabled by default, so this CL is a
no-op unless the probe configurations are pushed.

Bug: b/79499239
Test: tests in CL pass, manual: captive portal login works
Change-Id: I785723aaed06054b9aa8ebff77803f23d7836db9
2018-05-23 20:48:46 +09:00
TreeHugger Robot
1561bb41bd Merge "Add Settings Slice Whitelist key" into pi-dev 2018-05-22 23:40:24 +00:00
Matthew Fritze
640821bbc8 Add Settings Slice Whitelist key
Bug: 79779103
Test: None - only a flag.
Change-Id: I764f2fddf05bf2b9df4e633c7f6c6c7e781c1149
Merged-In: I794159db4ff8aba7b6dcd91e13a984db40da47e7
2018-05-22 22:42:57 +00:00
Tony Huang
aef9007d12 Add theme mode design let user can choose theme self
am: f0800fa3bd

Change-Id: Ie4b645af602aac8575e1c220714b094118a3aaa6
2018-05-22 15:04:57 -07:00
Tony Huang
f0800fa3bd Add theme mode design let user can choose theme self
Add a ContentObserver on WallpaperManagerService to
listen THEME_MODE value change. When changed, call
notifyWallpaperColorsChanged and set WallpaperColors
color hint by the current mode.

Bug: 63903361
Test: manual
Change-Id: I4f7aa7b184565b1bb23c7f4f1f07fc310dac7546
2018-05-22 21:35:03 +00:00
Annie Meng
89f02f871d Merge "Allow restore of settings with nullable components" into pi-dev
am: 2d6dbbac04

Change-Id: I28f02ff934aed4e51395c6c1692f655cf35bbbed
2018-05-22 12:02:00 -07:00
Annie Meng
4451179411 Allow restore of settings with nullable components
Creates a new settings validator that allows for null components, which
have semantic meaning for certain settings (in this case, that no
service is selected).

Bug: 79925290
Test: 1) atest SettingsValidatorsTest
2) Manual:
- In Settings UI, select "None" for autofill service and accessibility
shortcut target
- "adb backup -keyvalue -f nullsettings.ab com.android.providers.settings"
- "adb restore nullsettings.ab"
- Verify no crashes and that autofill service and accessibility shortcut
target both have "None" in Settings UI

Change-Id: I159b3f4706c6b981a30437c31724b106eb4e3f2a
2018-05-22 11:11:58 +01:00
Annie Meng
0b653bc5e4 Merge "Check settings validators for NPE" into pi-dev
am: 3a95d0bb94

Change-Id: I75fe10196f29f10f80631f2a11ceda9e8a6d5d87
2018-05-22 03:03:21 -07:00
Annie Meng
eed1b812a4 Check settings validators for NPE
From b/79910479, we need to have better checks on settings validators.

Catch NPE for various settings validators and add a @Nullable annotation
to try to prevent NPEs in new validators.

Bug: 80067772
Test: atest SettingsValidatorsTest
Change-Id: I9a5058e1bae1ba0dea084c0589aa3e4ef3a51836
2018-05-21 16:42:23 +01:00
Beverly
6e66b320fd Merge changes Id4feeefa,Ie0a501b8 into pi-dev
am: 45a250a2be

Change-Id: Id58b92f3400f17fedb30524cc851fa3c1304af61
2018-05-18 16:33:20 -07:00
TreeHugger Robot
45a250a2be Merge changes Id4feeefa,Ie0a501b8 into pi-dev
* changes:
  Add counter for predictive info for hush gesture
  Update DND strings
2018-05-18 23:08:19 +00:00
Beverly
38fcfd0500 Add counter for predictive info for hush gesture
Test: adb shell settings get secure hush_gesture_used
Test: adb shell settings get secure manual_ringer_toggle_count
Change-Id: Id4feeefa03a5951c03b09ab466a6c399d8aadd0e
Fixes: 79537757
2018-05-18 21:45:17 +00:00
Beverly
89876010f1 Merge "(Behind flag) Wireless charging vibration feedback" into pi-dev
am: fedf04f3df

Change-Id: Ib7ee0e91da5d475bc2fa989b7e0a152c50f9f886
2018-05-18 14:25:45 -07:00
TreeHugger Robot
fedf04f3df Merge "(Behind flag) Wireless charging vibration feedback" into pi-dev 2018-05-18 20:57:21 +00:00
Erik Kline
413d00c1c0 Merge "Add explicit override for default Private DNS mode" into pi-dev
am: 2b3c858296

Change-Id: If480ab40c7cf9ab75c52feafc28338a049cbceef
2018-05-18 01:08:26 -07:00
TreeHugger Robot
2b3c858296 Merge "Add explicit override for default Private DNS mode" into pi-dev 2018-05-18 07:59:58 +00:00
Annie Meng
c9fd5be45f Merge "Fix NPE in ComponentNameValidator" into pi-dev
am: b105913098

Change-Id: I9725217151634a66d7cd3dc0e80acb5f78f15c39
2018-05-17 11:34:33 -07:00
Annie Meng
b105913098 Merge "Fix NPE in ComponentNameValidator" into pi-dev 2018-05-17 18:20:29 +00:00
Annie Meng
5d26b8c03a Fix NPE in ComponentNameValidator
In general, we should consider null component names as invalid settings,
meaning that we don't restore.

b/79925290 to allow restoring null component names for specific
settings where null has semantic meaning.

Bug: 79910479
Test: 1) atest SettingsValidatorsTest
2) Manual:
- In Settings UI, select "None" for autofill service and accessibility
shortcut target
- "adb backup -keyvalue -f nullsettings.ab com.android.providers.settings"
- "adb restore nullsettings.ab" and verify no crashes
Change-Id: Iffecbe7d26a93a816e7be42f564ba471f9681876
2018-05-17 17:56:58 +00:00
Erik Kline
1984179409 Add explicit override for default Private DNS mode
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 79719289
Change-Id: I943c5476666e47d04690626e2133f501cb875b46
2018-05-17 17:41:12 +09:00