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
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
2017-07-25 01:13:59 +00:00
Kevin Chyn
df872a5f0a
Default-off FP Swipe am: 8f5de15ba1 am: 0d378e04ca
...
am: a3874cf593
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
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
febf70348b
Merge "Update string for bluetooth device visibility" into oc-mr1-dev am: c239561da5
...
am: 3c8b12e2dd
2017-07-24 21:49:10 +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
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
Michael Wachenschwanz
bd891f5813
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev am: a47a3f58bf
...
am: 4a36ff9338
2017-07-24 19:09:08 +00: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
Ajay Nadathur
7af28ecb66
Use fingerprint icons during setupwizard flow
...
Use fingerprint icon when lock screens are loaded on
fingerprint setup's behalf.
bug: 63809908
Test: Manually tested and verified. Also added robolectric tests
Change-Id: I773a1eec2466e7ab626cc3330f5ce987a21b048f
2017-07-24 11:45:13 -07: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
Lei Yu
09f4ae371e
Merge "Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605 am: 5e48ea193b" into oc-mr1-dev-plus-aosp
...
am: 84d82d3d9e
2017-07-24 18:23:25 +00:00
Lei Yu
a0b1fa6120
Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605 am: 0f9fa63c3a
...
am: d98275c7dc
2017-07-24 18:23:05 +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
Lei Yu
9e5f170d7f
Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605
...
am: 5e48ea193b
2017-07-24 18:14:14 +00:00
Lei Yu
d98275c7dc
Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605
...
am: 0f9fa63c3a
2017-07-24 18:14:13 +00:00
Lei Yu
0f9fa63c3a
Merge "Add log for anomaly." into oc-dr1-dev
...
am: 6666bf5605
2017-07-24 18:07:13 +00:00
Lei Yu
5e48ea193b
Merge "Add log for anomaly." into oc-dr1-dev
...
am: 6666bf5605
2017-07-24 18:07:12 +00:00
Lei Yu
6666bf5605
Merge "Add log for anomaly." into oc-dr1-dev
2017-07-24 17:56:35 +00:00
Andrew Sapperstein
68f252e9bd
Merge "Add ResultPayload for always-on ambient display. am: eb1a45b95b am: cfb2b87d03 -s ours" into oc-mr1-dev-plus-aosp
...
am: 867ee49254
2017-07-24 17:48:49 +00:00
Andrew Sapperstein
bc0481fe4c
Add ResultPayload for always-on ambient display. am: eb1a45b95b -s ours am: 8389d669f1 -s ours
...
am: 7b2efcace8
2017-07-24 17:48:27 +00:00
Android Build Merger (Role)
867ee49254
Merge "Add ResultPayload for always-on ambient display. am: eb1a45b95b am: cfb2b87d03 -s ours" into oc-mr1-dev-plus-aosp
2017-07-24 17:42:01 +00:00
Andrew Sapperstein
0e8ce838ec
Add ResultPayload for always-on ambient display. am: eb1a45b95b
...
am: cfb2b87d03
2017-07-24 17:41:47 +00:00
Andrew Sapperstein
7b2efcace8
Add ResultPayload for always-on ambient display. am: eb1a45b95b -s ours
...
am: 8389d669f1
2017-07-24 17:41:42 +00:00
Andrew Sapperstein
cfb2b87d03
Add ResultPayload for always-on ambient display.
...
am: eb1a45b95b
2017-07-24 17:34:10 +00:00
Andrew Sapperstein
8389d669f1
Add ResultPayload for always-on ambient display.
...
am: eb1a45b95b
2017-07-24 17:34:06 +00:00
Andrew Sapperstein
92c100e02d
Add ResultPayload for always-on ambient display. am: 36af00bb21
...
am: e77497ce6a
2017-07-24 17:22:08 +00:00
Andrew Sapperstein
e77497ce6a
Add ResultPayload for always-on ambient display.
...
am: 36af00bb21
2017-07-24 17:08:17 +00:00
