Fan Zhang
3bc97152d1
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee
...
am: 2f84a358d9
2017-07-25 21:39:00 +00:00
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
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
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
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
Lei Yu
5963ffd4e3
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
2017-07-25 20:48:02 +00: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
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
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
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
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
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
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
2017-07-25 01:10:35 +00:00
Kevin Chyn
a3874cf593
Default-off FP Swipe am: 8f5de15ba1
...
am: 0d378e04ca
2017-07-25 01:10:34 +00:00
Kevin Chyn
e4fed2ee05
Default-off FP Swipe
...
am: 8f5de15ba1
2017-07-25 01:07:31 +00:00
Kevin Chyn
0d378e04ca
Default-off FP Swipe
...
am: 8f5de15ba1
2017-07-25 01:07:31 +00:00
Fan Zhang
3c8b12e2dd
Merge "Update string for bluetooth device visibility" into oc-mr1-dev
...
am: c239561da5
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
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
Michael Wachenschwanz
4a36ff9338
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
...
am: a47a3f58bf
2017-07-24 19:06:37 +00:00
Michael Wachenschwanz
a47a3f58bf
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
2017-07-24 19:02:12 +00:00
Fan Zhang
358d30f093
Update string for bluetooth device visibility
...
Change-Id: I33baa5e72596e10f10f13d2324144ca9036c3fc9
Fix: 62891178
Test: visual
Test: robotests
2017-07-24 18:40:59 +00:00
Android Build Merger (Role)
84d82d3d9e
Merge "Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605 am: 5e48ea193b" into oc-mr1-dev-plus-aosp
2017-07-24 18:14:28 +00:00
