Roshan Pius
096e14d92f
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
...
am: 2b689e63ca
-s ours
Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c
2017-07-25 20:56:33 +00:00
Lei Yu
ce4ed05085
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
...
am: 5963ffd4e3
Change-Id: I71b5405e87c0ad7833eb8aa6cc8cbd6dfc0420bb
2017-07-25 20:55:21 +00:00
Lei Yu
2e70aea742
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
...
am: 5963ffd4e3
Change-Id: If4946179167529463ddbe23c83b3e37a21fec222
2017-07-25 20:55:16 +00:00
Roshan Pius
2b689e63ca
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
2017-07-25 20:52:29 +00:00
Andrew Sapperstein
d2cf55bccd
Fix robotests.
...
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.
Change-Id: I7179475df649b7a053deb0fa20e4c6c33f6a8acd
Merged-In: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes: 64024743
Test: robotests
2017-07-25 13:51:20 -07:00
Lei Yu
5963ffd4e3
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
2017-07-25 20:48:02 +00:00
Fan Zhang
84dd783c36
Fix a monkey crash in Developer settings.
...
- DevSetting shouldn't add switchbar listener if it's a Monkey test run
- DevSetting shouldn't remove switchbar listener if it's not registered
- Refactor some switchbar logic in order to create test
Change-Id: Ie65ff9b04778075789010169039393bd0551acfb
Fix: 64021498
Test: robotests
2017-07-25 13:06:32 -07:00
Matthew Fritze
458bb887e1
Add default value to inline payloads
...
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.
Manual merge for: ag/2588219/
Change-Id: I3b8eea4f82764852cea642db4455ba57f10a7d37
Fixes: 63955012
Test: robotests
2017-07-25 10:44:15 -07:00
Doris Ling
4427cd7e22
Disable Wallpaper setting when Wallpaper is disabled.
...
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.
Bug: 63939450
Test: make RunSettingsRoboTests
Change-Id: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
2017-07-25 10:38:22 -07:00
Roshan Pius
185e462d91
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-mr1-dev am: 7030ceb9e3
...
am: 814967b90c
Change-Id: I491ea476fd651b2f29339ddba145ee78eee761cb
2017-07-25 17:27:53 +00:00
jackqdyulei
8dba5a03a1
Add anomaly detection method to AnomalyUtils
...
So we could reuse it in different loaders.
Bug: 63900914
Test: robotests still pass
Change-Id: I038085f53b9d0a05b8c4849c7544567434885821
2017-07-25 10:20:10 -07:00
Roshan Pius
814967b90c
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-mr1-dev
...
am: 7030ceb9e3
Change-Id: I0a9cbb6a36950f354145ca1a1a0dac71506aee68
2017-07-25 17:19:12 +00:00
Roshan Pius
9265f48c4b
settings(manifest): Add NETWORK_SETTINGS permission
...
This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.
Bug: 64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
Merged-In: I932226a74b12bf726a2445188953b1ec34523cf9
2017-07-25 17:10:14 +00:00
Roshan Pius
7030ceb9e3
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-mr1-dev
2017-07-25 17:09:52 +00:00
Roshan Pius
37a46a1a70
settings(manifest): Add NETWORK_SETTINGS permission
...
This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.
Bug: 64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
(cherry-picked from b0a09304e380645a84651c0de668a78a7beaac3b)
2017-07-25 07:39:26 -07:00
Bartosz Fabianowski
99b80a360f
Merge "Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353
am: 96a14ff07e" into oc-mr1-dev-plus-aosp
...
am: 5c6b057e7f
Change-Id: I3334217dfbbada1ee58f912acbdbe13077b91e54
2017-07-25 10:26:02 +00:00
Bartosz Fabianowski
9294472953
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353
am: cfc3ccdb82
...
am: e0a9eb0cad
Change-Id: Ib0f669e85f6cd44653dcb1227d4d0aec14296f74
2017-07-25 10:25:40 +00:00
Android Build Merger (Role)
5c6b057e7f
Merge "Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353
am: 96a14ff07e" into oc-mr1-dev-plus-aosp
2017-07-25 10:22:31 +00:00
Bartosz Fabianowski
6dec3960b2
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353
...
am: 96a14ff07e
Change-Id: I771a025ef9b38b80c6719de3dbc3b7f86971727e
2017-07-25 10:22:10 +00:00
Bartosz Fabianowski
e0a9eb0cad
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev am: 262aacd353
...
am: cfc3ccdb82
Change-Id: I2c73cf6895da1188027d0f8704f795490f1e7be1
2017-07-25 10:22:09 +00:00
Bartosz Fabianowski
cfc3ccdb82
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
...
am: 262aacd353
Change-Id: I24ffc75897c92124cf9416ea79ff4c704a733c0e
2017-07-25 10:18:41 +00:00
Bartosz Fabianowski
96a14ff07e
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
...
am: 262aacd353
Change-Id: I66fbaf0f98dd22679068f1fdefce0e7dbfc81939
2017-07-25 10:18:41 +00:00
Bartosz Fabianowski
262aacd353
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
2017-07-25 10:14:50 +00:00
TreeHugger Robot
9fefa87cda
Merge "Add dependencies on org.apache.http.legacy where needed"
2017-07-25 08:12:50 +00:00
Kevin Chyn
d843fddcc9
Merge "Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am: 5e707ccb3d
am: 936680ab3e
-s ours" into oc-mr1-dev-plus-aosp
...
am: 7d998d4ed1
-s ours
Change-Id: Ic66fb46716dde4723c21de5f6e3b4e9de9a6434e
2017-07-25 05:43:24 +00:00
Kevin Chyn
ddacbd4d80
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am: 5e707ccb3d
-s ours am: 7edaa60315
-s ours
...
am: 5f301cb003
-s ours
Change-Id: I82c629a9faa1f94e038a085227172a035ca84ef2
2017-07-25 05:42:58 +00:00
Android Build Merger (Role)
7d998d4ed1
Merge "Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am: 5e707ccb3d
am: 936680ab3e
-s ours" into oc-mr1-dev-plus-aosp
2017-07-25 05:40:14 +00:00
Kevin Chyn
0999c93062
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am: 5e707ccb3d
...
am: 936680ab3e
-s ours
Change-Id: I584f4a373902d590e46e93df75cfcb4fd56608ec
2017-07-25 05:39:57 +00:00
Kevin Chyn
5f301cb003
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev am: 5e707ccb3d
-s ours
...
am: 7edaa60315
-s ours
Change-Id: Ib353f82b3bff8cd8a420bf6581a603e06d2b8244
2017-07-25 05:39:56 +00:00
Kevin Chyn
936680ab3e
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
...
am: 5e707ccb3d
Change-Id: Ib988ae3439dbbaed2c84d906b6e88412ce27461f
2017-07-25 05:36:32 +00:00
Kevin Chyn
7edaa60315
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
...
am: 5e707ccb3d
-s ours
Change-Id: Ia0a0f8fff5bec512656229aaf2d81e0952760c4e
2017-07-25 05:36:26 +00:00
Kevin Chyn
5e707ccb3d
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
2017-07-25 05:31:53 +00:00
Kevin Chyn
6e873a8fb6
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev am: af63fc249e
...
am: 06fa3638ec
Change-Id: I7805293b17139ff9e4c2071c3ff7df9999a9454d
2017-07-25 02:50:32 +00:00
Kevin Chyn
06fa3638ec
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev
...
am: af63fc249e
Change-Id: I15fc66e922871264476a2ebb6893838b273f8576
2017-07-25 02:42:11 +00:00
Kevin Chyn
2a2dcb52cb
Fingerprint swipe settings and suggestions should not show if hardware unavailable
...
Fixes: 63589121
Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests
Merged-In: I2539128daff8df52d040606141f772fc9edffa57
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-25 02:33:30 +00:00
TreeHugger Robot
af63fc249e
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-mr1-dev
2017-07-25 02:32:31 +00:00
Kevin Chyn
26dd2708cc
Merge "Default-off FP Swipe am: 8f5de15ba1
am: e4fed2ee05" into oc-mr1-dev-plus-aosp
...
am: fbde89ea2c
Change-Id: I7f0c54717587b3d8491a29aaade3a50c7df04d66
2017-07-25 01:13:59 +00:00
Kevin Chyn
df872a5f0a
Default-off FP Swipe am: 8f5de15ba1
am: 0d378e04ca
...
am: a3874cf593
Change-Id: Ib2d312d36a5200ed4b677eb2a4d79f9e84b12d75
2017-07-25 01:13:04 +00:00
Android Build Merger (Role)
fbde89ea2c
Merge "Default-off FP Swipe am: 8f5de15ba1
am: e4fed2ee05" into oc-mr1-dev-plus-aosp
2017-07-25 01:11:02 +00:00
Kevin Chyn
7452e615f4
Default-off FP Swipe am: 8f5de15ba1
...
am: e4fed2ee05
Change-Id: I16a7a4aa7198c77885c44841c3a175cee46753e6
2017-07-25 01:10:35 +00:00
Kevin Chyn
a3874cf593
Default-off FP Swipe am: 8f5de15ba1
...
am: 0d378e04ca
Change-Id: I8dd88ec940d3624c5eb7f59facd0c1ed7c4de55e
2017-07-25 01:10:34 +00:00
Kevin Chyn
e4fed2ee05
Default-off FP Swipe
...
am: 8f5de15ba1
Change-Id: Ie575c4a6335b83b00d8f2614bba532843a88534d
2017-07-25 01:07:31 +00:00
Kevin Chyn
0d378e04ca
Default-off FP Swipe
...
am: 8f5de15ba1
Change-Id: Iac3a85ac3e0d6f30d32b2823f168f3123d375f08
2017-07-25 01:07:31 +00:00
Fan Zhang
febf70348b
Merge "Update string for bluetooth device visibility" into oc-mr1-dev am: c239561da5
...
am: 3c8b12e2dd
Change-Id: I3eff784da35cbb8713540518c271842945e63d12
2017-07-24 21:49:10 +00:00
Fan Zhang
3c8b12e2dd
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
...
am: c239561da5
Change-Id: Ic124bbed9f9bf3185787444264d063185f9754f6
2017-07-24 21:38:18 +00:00
TreeHugger Robot
c239561da5
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
2017-07-24 21:29:22 +00:00
Kevin Chyn
8f5de15ba1
Default-off FP Swipe
...
Fixes: 63992836
Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests
Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784
2017-07-24 14:00:18 -07:00
Andrew Sapperstein
c8c42838ca
Make AirplaneModePrefController.isAvailable static.
...
Allows calling without instantiating the pref controller.
Also some minor cleanup of MobileNetworkPrefController.
Bug: 62022517
Test: robotests
Change-Id: I34ff5d3729d06158bff3cc125de4c114bf4861d5
2017-07-24 13:42:19 -07:00
Kevin Chyn
82792cc5b3
Fingerprint swipe settings and suggestions should not show if hardware unavailable
...
Fixes: 63589121
Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests
Change-Id: I2539128daff8df52d040606141f772fc9edffa57
2017-07-24 13:40:34 -07:00
Fan Zhang
a4a3833a08
Fix search indexing for encryption_and_credential page
...
- Rewrite search index provider to include all possible keys through
getXmlResourcesToIndex()
- Add isPageSearchEnabled() to disable all keys if user is not admin
- Add getNonIndexableKeys to suppress unrelated keys based on current
device state
Change-Id: I2c6943483789bf4c9f3931d344cf279fec0edaee
Fix: 37650170
Test: robotests
2017-07-24 12:34:34 -07:00