Rebecca Silberstein
d52c17c765
Revert back to isDualBandSupported() for Wifi tethering.
...
This is needed to maintain OEM compatibility
Bug: 33160120
Test: robotests
Change-Id: Ic302969d33f32da72aee47d29615a250d3d924e2
2017-09-12 12:46:26 -07:00
Malcolm Chen
26938b36ee
In ApnEditor, restore preference values after re-creating.
...
After destroying and re-creating, the preference values in ApnEditor
are not restored. This results in incorrect behavior if it enters
two window mode where it's destroyed and re-created. The fix is to
have them restored and shown correctly.
Bug: 65338066
Test: Manual
Change-Id: I5ea16ce01c72061ab116f9c15bfc5cc39bb7a095
2017-09-12 01:01:09 +00:00
Antony Sargent
a2559ab128
Prevent brief flash of "Error" in hotspot status text
...
When toggling the master preference to turn on wifi hotspot, it briefly
changes the status text to "Error" because we have a catch-all in a
function monitoring wifi state changes for unexpected status codes, and
we weren't expecting to see the status of WIFI_AP_STATE_ENABLING before
the status of WIFI_AP_STATE_ENABLED.
Bug: 64811203
Test: make RunSettingsRoboTests
Change-Id: Ifba7abadbfba9ce93cc524b17232c65570f0f428
2017-09-11 16:50:10 -07:00
Sundeep Ghuman
381987a8ce
Gate WifiSettings verbose logging on toggle.
...
These aids in debugging bugreports, which are filed with verbose
logging.
Bug: b/64989100
Test: NA
Change-Id: Ife1940ddb5fdec997cc07304b8c160244ec8356b
2017-09-11 15:43:49 -07:00
debesay guadad
6d5fbfdc72
Merge "Add ims registration status" am: 9b7479f8a9 -s ours am: d3c72406b6 -s ours
...
am: 91b143383c -s ours
Change-Id: Iacba38adf23ae48fa92ca852620fc9232629fa73
2017-09-11 21:06:31 +00:00
debesay guadad
91b143383c
Merge "Add ims registration status" am: 9b7479f8a9 -s ours
...
am: d3c72406b6 -s ours
Change-Id: I15bdf67a2be0187682a936d3fe8a0ae42d8329b5
2017-09-11 20:27:24 +00:00
Android Build Merger (Role)
b7773add7d
Merge "Merge "Add ims registration status" into stage-aosp-master am: af845720f6 am: 99768cc46c -s ours" into oc-mr1-dev-plus-aosp
2017-09-11 20:10:25 +00:00
Maurice Lam
4f61cfb967
Merge "Fix sizing of pattern view" into oc-mr1-dev
...
am: adef5b23e0
Change-Id: I63928a5e53bf15b30d50f28fa9c4518503d005d7
2017-09-11 20:09:55 +00:00
debesay guadad
d3c72406b6
Merge "Add ims registration status"
...
am: 9b7479f8a9 -s ours
Change-Id: I65a6d75b2f2127929794c320fe7596372dd4c6ac
2017-09-11 20:09:47 +00:00
Antony Sargent
707552888d
Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
...
am: b8ff97fbd5
Change-Id: I559aa49ff0ef4aa82a6a1fb989d05c81ac7575fe
2017-09-11 20:09:25 +00:00
Maurice Lam
adef5b23e0
Merge "Fix sizing of pattern view" into oc-mr1-dev
2017-09-11 20:07:48 +00:00
Maurice Lam
7efcc35d85
Fix sizing of pattern view
...
Align the size of pattern view in ChooseLockPattern,
ConfirmLockPattern, and keyguard as much as possible.
In rare cases they may still be inconsistent because
the screens have different content outside of the
pattern view (e.g. header text, navigation buttons etc)
Test: Manual
Bug: 64339681
Change-Id: Ie07ae211340967a3cdf9c6c28f9818f207dbd2c9
2017-09-11 20:07:17 +00:00
Brad Ebinger
e4589c3dfb
Merge "Add ims registration status" into stage-aosp-master am: af845720f6
...
am: 99768cc46c -s ours
Change-Id: Idcab879ef2b9f1891dbae4309e7a971f48660b97
2017-09-11 20:06:21 +00:00
Brad Ebinger
99768cc46c
Merge "Add ims registration status" into stage-aosp-master
...
am: af845720f6
Change-Id: I5daf6e9a55e10d20fc03be6a54801ad6d6533bf8
2017-09-11 19:54:02 +00:00
TreeHugger Robot
b8ff97fbd5
Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
2017-09-11 19:52:47 +00:00
Treehugger Robot
9b7479f8a9
Merge "Add ims registration status"
2017-09-11 19:44:31 +00:00
Brad Ebinger
af845720f6
Merge "Add ims registration status" into stage-aosp-master
2017-09-11 19:42:37 +00:00
Amit Mahajan
e886c7c2c1
Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09 am: 6ca28e8362
...
am: 154779b6af
Change-Id: I90715e84699ac52ce727782917c7a0c75a40e843
2017-09-11 18:01:35 +00:00
jackqdyulei
52a2d32a37
Merge "Make system item has a consistent name." into oc-mr1-dev
...
am: 9a3cb9b835
Change-Id: I928f4266130d488476aadd6dd61a3ce22c579aa2
2017-09-11 17:53:43 +00:00
Amit Mahajan
154779b6af
Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09
...
am: 6ca28e8362
Change-Id: I7e14539d3b22918c8d4a1aa4d41ba96afe88ca1c
2017-09-11 17:51:18 +00:00
Amit Mahajan
6ca28e8362
Merge "Change to disable mvno data field in ApnEditor if needed."
...
am: c2c0edff09
Change-Id: If53f719245876dda59b220a9b066f30f1c1e0fbc
2017-09-11 17:37:55 +00:00
TreeHugger Robot
9a3cb9b835
Merge "Make system item has a consistent name." into oc-mr1-dev
2017-09-11 17:33:09 +00:00
Treehugger Robot
c2c0edff09
Merge "Change to disable mvno data field in ApnEditor if needed."
2017-09-11 17:21:07 +00:00
Antony Sargent
9be8c3fbfe
Fix focus behavior of ValidatedEditTextPreference
...
The bug report was that the cursor is set to the beginning of the
EditText for wifi hotspot password field, instead of at the end (or
having the entire field selected). This fix makes it so that all
ValidatedEditTextPreference's will put the cursor at the end of the
EditText.
Bug: 65413206
Test: make RunSettingsRoboTests
Change-Id: I23f3bb1b3f1b49b2f193c0ae2e103eae5c1a1019
2017-09-11 10:12:05 -07:00
Amit Mahajan
ad8eba3097
Change to disable mvno data field in ApnEditor if needed.
...
Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
2017-09-11 09:08:49 -07:00
Erik Kline
775807f422
Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev
...
am: 1b62d99433
Change-Id: If15181d557e9abce75111a6e1fff4e12586d7dbc
2017-09-11 05:00:34 +00:00
TreeHugger Robot
1b62d99433
Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev
2017-09-11 04:56:28 +00:00
Erik Kline
9adc588749
Include IPv6 DNS servers in wifi details
...
Test: as follows
- built
- flashed
- booted
- export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
make -j RunSettingsRoboTests
RunSettingsRoboTests:
RunSettingsRoboTests: Time: 19.821
RunSettingsRoboTests:
RunSettingsRoboTests: OK (37 tests)
RunSettingsRoboTests:
- make -j RunSettingsRoboTests
RunSettingsRoboTests: ...........................
RunSettingsRoboTests: Time: 424.847
RunSettingsRoboTests:
RunSettingsRoboTests: OK (2250 tests)
RunSettingsRoboTests:
Bug: 65037256
Bug: 65467586
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
2017-09-11 11:24:45 +09:00
Fan Zhang
ed71e21541
Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
...
am: 90f9398f4e
Change-Id: Idb6dabf0d06440f3a2aecc2f4488bb98859f2eae
2017-09-08 22:04:52 +00:00
Daniel Nishi
df0e716b43
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
...
am: 3315f38c3f
Change-Id: I7f8bfe688afc95a184fc6499b95a3c733cb9c681
2017-09-08 22:04:12 +00:00
TreeHugger Robot
90f9398f4e
Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
2017-09-08 21:42:32 +00:00
Daniel Nishi
3315f38c3f
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
2017-09-08 21:39:16 +00:00
Maurice Lam
f26fe2763a
Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
...
am: 40e284b196
Change-Id: Ica634ce9776b0b0c30bfb49223a4d1d5fc5398ad
2017-09-08 19:56:09 +00:00
Maurice Lam
40e284b196
Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
2017-09-08 19:50:52 +00:00
Andrew Scull
e1f4703dbe
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev
...
am: 0bac26b6cd
Change-Id: I30996559ac5166d4ed2cf59688239effe335a305
2017-09-08 19:33:34 +00:00
TreeHugger Robot
0bac26b6cd
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev
2017-09-08 19:08:48 +00:00
Maurice Lam
f2063cff30
Don't default to PIN on non FBE devices. DO NOT MERGE
...
So that EncryptionInterstitial is shown as part of the flow
Test: cd tests/robotests && mma
Bug: 65192141
Change-Id: I13e8b9059aae39cef2a8509f9f0eee1cd0808220
2017-09-08 18:58:27 +00:00
Stephen Chen
d2f9de37c7
Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev
...
am: 194638ac78
Change-Id: I6dc3ce13040a0b20b5197c5cfac6bc55b09ab679
2017-09-08 18:55:58 +00:00
TreeHugger Robot
194638ac78
Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev
2017-09-08 18:47:08 +00:00
TreeHugger Robot
6f48d5e767
Merge "Add ims registration status" into oc-mr1-dev-plus-aosp
2017-09-08 17:14:18 +00:00
Daniel Nishi
59c8d77c8c
Re-add the block of text explaining the feature.
...
When the automatic storage manager is off (or has never been run), we
display a block of text that explains what it does. In order to make
this testable, I've implemented the feature in a PreferenceController
and upgraded the existing AutomaticStorageManagerSettings class to be
closer to the newer Settings IA.
Change-Id: I3f7d20347a6d5a7bae8bffcd2014c3fdcd315b90
Fixes: 63082545
Test: Settings Robotest
2017-09-08 09:58:05 -07:00
Andrew Scull
2ca3017f8e
Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.
...
If an admin has set the DISALLOW_FACTORY_RESET user restriction, OEM
unlock is also restricted. If this is the case, it should be explained
to the user that the admin is preventing the OEM unlock.
DISALLOW_OEM_UNLOCK is deprecated and now managed by OemLockManager.
This restriction is also one set by the carrier, not an admin.
Test: RunSettingsRoboTests
Test: CTS verifier test from the bug
Bug: 65124732
Change-Id: I8bde87a522742a7cbda006eee17c2a19797b1835
(cherry picked from commit 0aa45bed65 )
2017-09-08 16:11:36 +00:00
daqi
b4204836cf
Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508 am: 93860b298b
...
am: 21e55623f2
Change-Id: I38f6f53ffd70f8b1ac67ea3695d2b9d5d4b76509
2017-09-08 10:16:34 +00:00
daqi
21e55623f2
Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508
...
am: 93860b298b
Change-Id: Ic6fd44c164821fc7c5594b1b5082c2ee6e36aa0f
2017-09-08 10:10:16 +00:00
daqi
93860b298b
Merge "Fix TrustedCredentialsSettings NPE"
...
am: c9e532f508
Change-Id: I2ce8ea95abbbd1d522be4897069d4515354d3b14
2017-09-08 10:04:17 +00:00
Treehugger Robot
c9e532f508
Merge "Fix TrustedCredentialsSettings NPE"
2017-09-08 09:56:31 +00:00
Ajay Nadathur
1fe7838e70
Merge "Set title in remote views if present in bundle" into oc-mr1-dev
...
am: 4ce113d6f8
Change-Id: Iaa650a18bd4efb74e6b903efad0ad1a02865429c
2017-09-08 06:43:46 +00:00
TreeHugger Robot
4ce113d6f8
Merge "Set title in remote views if present in bundle" into oc-mr1-dev
2017-09-08 06:36:46 +00:00
Fan Zhang
1ca6b25321
Don't attempt to tint icon if icon is not available
...
Change-Id: I0aa2a17d51d966dce182381c7bba8913ad997738
Fixes: 65460834
Test: robotests
2017-09-08 00:10:55 +00:00
Jack He
d9de1ecc03
Bluetooth: add metrics for pairing with devices without names
...
am: 5b017f7b05
Change-Id: If74bd132ee1352888a7f9513444e998537f11145
2017-09-07 23:25:43 +00:00