Fan Zhang
2f84a358d9
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
...
am: 6ef56e43ee
2017-07-25 21:30:57 +00:00
Fan Zhang
f854a08c3e
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
...
am: 6ef56e43ee
2017-07-25 21:30:26 +00:00
TreeHugger Robot
6ef56e43ee
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
2017-07-25 21:23:19 +00:00
Matthew Fritze
eb506cce5f
Merge "Add default value to inline payloads" into oc-mr1-dev
...
am: 151cc3166d
2017-07-25 21:23:15 +00:00
Roshan Pius
333b7f5600
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca am: 974920af47 -s ours
...
am: 7952871e18
2017-07-25 21:16:08 +00:00
Roshan Pius
06cc4e0395
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca -s ours am: 096e14d92f -s ours
...
am: e71f1bc007
2017-07-25 21:12:39 +00:00
Lei Yu
67a0275d5a
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3 am: 2e70aea742
...
am: 716d4b2162
2017-07-25 21:11:52 +00:00
Lei Yu
434758b01d
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3 am: ce4ed05085
...
am: 7d2007dacf
2017-07-25 21:11:16 +00:00
Matthew Fritze
151cc3166d
Merge "Add default value to inline payloads" into oc-mr1-dev
2017-07-25 21:10:55 +00:00
Roshan Pius
7952871e18
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca
...
am: 974920af47
2017-07-25 21:06:25 +00:00
Roshan Pius
974920af47
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
...
am: 2b689e63ca
2017-07-25 21:01:43 +00:00
Roshan Pius
e71f1bc007
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca -s ours
...
am: 096e14d92f
2017-07-25 21:01:25 +00:00
Lei Yu
716d4b2162
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3
...
am: 2e70aea742
2017-07-25 21:00:41 +00:00
Lei Yu
7d2007dacf
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3
...
am: ce4ed05085
2017-07-25 20:58:12 +00:00
Andrew Sapperstein
261f3230e0
Fix robotests.
...
Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.
Change-Id: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes: 64024743
Test: robotests
2017-07-25 20:57:51 +00:00
Roshan Pius
096e14d92f
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
...
am: 2b689e63ca
2017-07-25 20:56:33 +00:00
Lei Yu
ce4ed05085
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
...
am: 5963ffd4e3
2017-07-25 20:55:21 +00:00
Lei Yu
2e70aea742
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
...
am: 5963ffd4e3
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
Christine Franks
a0dd987d20
Restrict changing wi-fi networks
...
Bug: 31852835
Test: manual - verify unrestricted as regular user, but that a password
is required in demo mode.
Change-Id: I60f95ccbb10ba728b384b9c8c2ae723934fb2928
2017-07-25 13:31:12 -07: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
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
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
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
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
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
2017-07-25 10:22:09 +00:00
Bartosz Fabianowski
cfc3ccdb82
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
...
am: 262aacd353
2017-07-25 10:18:41 +00:00
Bartosz Fabianowski
96a14ff07e
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
...
am: 262aacd353
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
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
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
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
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
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
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
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
2017-07-25 02:42:11 +00:00
