Commit Graph

19117 Commits

Author SHA1 Message Date
Fan Zhang
43ef9743a2 Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am: 5fb56c5b37

Change-Id: I7974307f83886ab9e075eee4ef347ef95562acef
2017-07-26 06:07:37 +00:00
Fan Zhang
2583cbe16b Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am: 5fb56c5b37

Change-Id: Id4ae064a804b649b431913f02bde26013c1c87c2
2017-07-26 06:07:30 +00:00
Fan Zhang
5fb56c5b37 Merge "Extract method to build preference count logging's name." into oc-dr1-dev 2017-07-26 05:59:57 +00:00
Doris Ling
0224a409a9 Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev 2017-07-26 04:14:07 +00:00
Christine Franks
5ffcae25c5 Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316 am: a1f56b5faa
am: 02de4d0e23

Change-Id: I465d422b25e682cde7e486dc08b9871bff9383fe
2017-07-26 03:21:30 +00:00
Christine Franks
be0ac89704 Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am: a7e10e0316

Change-Id: Ia864cb26244e294b7e6a31ebfd559dd727ef7003
2017-07-26 02:56:36 +00:00
Christine Franks
a1f56b5faa Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am: a7e10e0316

Change-Id: Ifcb15f741c4bcb72c32789870bc50027d2fc4cbb
2017-07-26 02:52:52 +00:00
Christine Franks
a7e10e0316 Merge "Restrict changing wi-fi networks" into oc-dr1-dev 2017-07-26 02:38:08 +00:00
Doris Ling
882020d14b Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92 am: f8bb8a9792
am: c0eac3803d

Change-Id: I72106b5c3e73dc194a5678e6e4c3ec6306d6b413
2017-07-26 02:16:15 +00:00
Doris Ling
c0eac3803d Merge "Add divider line below "see all apps" preference" into oc-dr1-dev am: 0e9711ab92
am: f8bb8a9792

Change-Id: I91b902ed5db6662e7e9fc2187049311b00b50cc6
2017-07-26 02:12:14 +00:00
Doris Ling
a60d3ef00c Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am: 0e9711ab92

Change-Id: I7fc59ace61bb89b40ab3eabe774a89128895515f
2017-07-26 02:08:45 +00:00
Doris Ling
f8bb8a9792 Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am: 0e9711ab92

Change-Id: I80aee4e13aff91ac66309df438511826a2b75187
2017-07-26 02:08:44 +00:00
TreeHugger Robot
9c41094483 Merge "Disable Wallpaper setting when Wallpaper is disabled." 2017-07-26 02:04:20 +00:00
TreeHugger Robot
0e9711ab92 Merge "Add divider line below "see all apps" preference" into oc-dr1-dev 2017-07-26 02:02:32 +00:00
Matthew Fritze
ee18f9f8aa Merge "Add default value to inline payloads" into oc-dr1-dev
am: 5aca5f3aec

Change-Id: Iabc71663e942b453e8125bc19401adccc06e85a3
2017-07-26 01:57:29 +00:00
TreeHugger Robot
5aca5f3aec Merge "Add default value to inline payloads" into oc-dr1-dev 2017-07-26 01:52:38 +00:00
Jack He
70f293ee50 Bluetooth: reset mConnectionState when adapter is OFF
* No device is connected when Bluetooth adapter is OFF
* BluetoothSummaryUpdater should reset its connection state tracker in
  order to display the correct summary message on ConnectedDevice
  preference
* Otherwise, "Connected to null" will be shown because no device is
  connected while BluetoothSummaryUpdater is still in CONNECTED state
* Removed unused imports from BluetoothSummaryUpdater
* Write additional unit test to verify the above behaviour
* Add additional logging when deviceName is null in CONNECTED state

Bug: 62492716
Test: Pair and connect to Bluetooth device, turning Bluetooth ON/OFF,
      unit tests
Change-Id: I30726636f5678d61d6052f5b8d211aa20f26f409
2017-07-26 00:31:55 +00:00
Andrew Sapperstein
26f2bd44f8 Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev am: 5b67e453bf am: fba88cc7c0
am: 5d8467a068

Change-Id: Ieb5836f758760c47a252e7ff07ef8fcbb627b4aa
2017-07-25 23:59:50 +00:00
Fan Zhang
8758496922 Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev am: 7da06bd11b
am: d8ed5645be

Change-Id: I8795c0da21730609a08091f6b864f5f0ec99d6b3
2017-07-25 23:59:05 +00:00
Fan Zhang
ae70d2cd34 Extract method to build preference count logging's name.
Bug: 35066566
Test: robotests still pass
Change-Id: I665b7ecea9866227ef3cb06bf4aebacbfa2c65a9
2017-07-25 16:49:43 -07:00
Doris Ling
3230d95f9c Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I85fb90ad783e5be008c9343a0804893604814bd1
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Merged-In: I1afba6639a2b94f9d57f546c220f417092f92387
Fix: 63939450
Test: make RunSettingsRoboTests
2017-07-25 16:40:30 -07:00
Andrew Sapperstein
fba88cc7c0 Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am: 5b67e453bf

Change-Id: I7454c59679ad05711f8923b35138fd27b6d36061
2017-07-25 23:34:03 +00:00
Andrew Sapperstein
1bb9b966ff Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am: 5b67e453bf

Change-Id: I7694793ff006a2c677511563b69e411b6ed284f2
2017-07-25 23:30:32 +00:00
Andrew Sapperstein
5b67e453bf Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev 2017-07-25 23:21:48 +00:00
Fan Zhang
7da06bd11b Merge "Fix a monkey crash in Developer settings." into oc-mr1-dev 2017-07-25 23:06:11 +00:00
Fan Zhang
00d306465c Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee am: 2f84a358d9
am: 3bc97152d1

Change-Id: Iea6491534c7d43a97456ab2e83eae5e32c747c80
2017-07-25 21:53:25 +00:00
Matthew Fritze
73056522b3 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.

Change-Id: I8a593d9ff3308b2d0cd5bc65658d160abf55b07e
Fixes: 63955012
Test: robotests
2017-07-25 14:37:05 -07:00
Matthew Fritze
7fdb865c1b Merge "Add default value to inline payloads" into oc-mr1-dev am: 151cc3166d
am: eb506cce5f

Change-Id: I2ffd4684a4cba96ea624d521d98d6dc52d86c170
2017-07-25 21:36:52 +00:00
Fan Zhang
2f84a358d9 Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am: 6ef56e43ee

Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7
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

Change-Id: I8778464bb80ff791b1e127bdca420065252fd76f
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
Lei Yu
434758b01d Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3 am: ce4ed05085
am: 7d2007dacf

Change-Id: Ia07cc9756c420c9193d6072a0971dacfcf854017
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
Lei Yu
7d2007dacf Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev am: 5963ffd4e3
am: ce4ed05085

Change-Id: Ibca49417ed69cbce3edf5d841d4c4f591c8f1e21
2017-07-25 20:58:12 +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
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
Antony Sargent
5d137f0f2c Allow open password dialog for wrong-password wifi access points
When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.

Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:

-The TestAccessPointBuilder class wasn't being found at runtime because
 it was getting stripped out at build time due to not being used in
 settings.

-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
 asserting that we don't end up with multiple entries for the same SSID
 in the access point list when changing the security state for the AP,
 but it was accidentally passing multiple AP's with the same name the
 first time.

Bug: 33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I929ca6892242059df157c01d6e9ea30e8d1c5e78
2017-07-25 20:25:59 +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
Doris Ling
5df37ec7b9 Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I1afba6639a2b94f9d57f546c220f417092f92387
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Bug: 63939450
Test: make RunSettingsRoboTests
2017-07-25 11:33:40 -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
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
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
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
Tadashi G. Takaoka
38a58371a0 Remove SHOW_INPUT_METHOD_PICKER receiver
Although there is a security check for IMM#showInputMethodPicker() [1],
any background application can virtually call the method via explicit
broadcast intent to Settings app.

Since showing IME picker from the notification has implemented in
InputMethodManagerService using protected-broadcast [2], the receiver in
Settings app isn't necessary and should be removed to close the security
bypass.

Note that this broadcast receiver stops working from Android-O due to
background check [3].

 [1]: I4f0fc21268200c64d12b31ca54416acfbf62f37b
 [2]: Id36c8c34159bea8b72557b40bcf024d401f580b6
 [3]: https://developer.android.com/preview/features/background.html#broadcasts

Test: The following broadcast intent will not show IME picker.
  $ adb shell am broadcast \
        -a android.settings.SHOW_INPUT_METHOD_PICKER \
        com.android.settings
Fixes: 64008672
Bug: 63644555
Change-Id: Id990c66516c9b3ed7ada6891746ec0e0eecbe545
2017-07-25 19:17:57 +09:00
Bartosz Fabianowski
262aacd353 Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev 2017-07-25 10:14:50 +00:00