Amit Mahajan
e886c7c2c1
Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09 am: 6ca28e8362
...
am: 154779b6af
2017-09-11 18:01:35 +00:00
jackqdyulei
52a2d32a37
Merge "Make system item has a consistent name." into oc-mr1-dev
...
am: 9a3cb9b835
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
2017-09-11 17:51:18 +00:00
Amit Mahajan
6ca28e8362
Merge "Change to disable mvno data field in ApnEditor if needed."
...
am: c2c0edff09
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
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
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
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
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
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
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
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
2017-09-08 10:16:34 +00:00
daqi
21e55623f2
Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508
...
am: 93860b298b
2017-09-08 10:10:16 +00:00
daqi
93860b298b
Merge "Fix TrustedCredentialsSettings NPE"
...
am: c9e532f508
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
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
2017-09-07 23:25:43 +00:00
debesay guadad
5b1651b3bb
Add ims registration status
...
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.
Test: manual Checked "IMS registration state" in Status menu
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 23:24:53 +00:00
Jack He
5b017f7b05
Bluetooth: add metrics for pairing with devices without names
...
* Also caches context in onClick() method
Bug: 34685932
Test: make, unit test
Change-Id: I99beab2c85b8e48c4bc41f69146759d4b7c62428
2017-09-07 12:09:00 -07:00
Daniel Nishi
7ee2b191d6
Merge "Turn in the work profile's badge." into oc-mr1-dev
...
am: 6361c9d851
2017-09-07 17:44:00 +00:00
Daniel Nishi
cad295918c
Merge "Cache storage values for fast loading." into oc-mr1-dev
...
am: 7fae6c67fb
2017-09-07 15:15:16 +00:00
Ajay Nadathur
ab07989b97
Set title in remote views if present in bundle
...
- Title set if defined in the Bundle returned by summaryUri's content
provider.
- summaryUri invoked inline with onBindView call
bug: 62713030
Test: Manually tested, verified that title and summary are retrieved
when settings app is resumed
Change-Id: Id82531eec5ec11ec3492f033fb34ec65a5437a48
2017-09-07 14:56:38 +00:00
daqi
be47df7395
Fix TrustedCredentialsSettings NPE
...
[Cause of Defect]
TrustedCredentialsSettings#mKeyChainConnectionByProfileId is get/set by
more than one thread. Main thread would set it in onDestroy method, and
AsyncTask would get and set in the doInBackground method. So
mKeyChainConnectionByProfileId.get(profileId) would get null after
onDestroy method get called.
Bug: N/A
Test: Debugger to simulate concurrency
Change-Id: I0664d1e9b88b079855354ce0e6fe014a98a22327
Signed-off-by: daqi <daqi@xiaomi.com >
2017-09-07 17:21:25 +08:00
TreeHugger Robot
6361c9d851
Merge "Turn in the work profile's badge." into oc-mr1-dev
2017-09-06 23:20:40 +00:00
Daniel Nishi
7fae6c67fb
Merge "Cache storage values for fast loading." into oc-mr1-dev
2017-09-06 23:07:14 +00:00
jackqdyulei
1e887c17e2
Make system item has a consistent name.
...
In battery settings, the system item contains many packages. In old
behaviour it will use the first package(which has legal name and icon)
to represent this item. This behaviour is not consistent.
In this cl, we always use package "android" to extract name and icon
if it is system item.
Bug: 65090883
Test: RunSettingsRoboTests
Change-Id: Ibb7f85c06ab1745867f1eaa666cea32c8d3295a6
2017-09-06 14:49:49 -07:00
Alison Cichowlas
22fc09757e
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
...
am: 40b8d3d238
2017-09-06 21:23:52 +00:00
Fan Zhang
08c4871dbe
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
...
am: bda6500884
2017-09-06 21:23:04 +00:00
Fan Zhang
b1ff93dfeb
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
...
am: dad9b79630
2017-09-06 21:22:14 +00:00
Alison Cichowlas
40b8d3d238
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
2017-09-06 21:01:35 +00:00
TreeHugger Robot
bda6500884
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
2017-09-06 20:37:15 +00:00
TreeHugger Robot
dad9b79630
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
2017-09-06 19:53:39 +00:00
Bill Yi
25012afc7f
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 14a359a550
2017-09-06 18:56:13 +00:00
TreeHugger Robot
14a359a550
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-06 18:40:23 +00:00
Bill Yi
f8f6cb368d
Import translations. DO NOT MERGE am: 535dd7f066 -s ours
...
am: 363626edcf
2017-09-06 18:40:07 +00:00
