OSDN Git Service
edgar.huang [Thu, 14 Sep 2017 20:41:44 +0000 (20:41 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am:
62a021850f am:
f95e7f9056
am:
e7da16fc8f
Change-Id: Idd10ba2234522c1679ebfbbc48c7bfda742f0a4e
edgar.huang [Thu, 14 Sep 2017 20:39:42 +0000 (20:39 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am:
62a021850f
am:
f95e7f9056
Change-Id: Ie6b48a64c62371cd276112b5b149fdf63341bb6f
edgar.huang [Thu, 14 Sep 2017 20:37:15 +0000 (20:37 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
am:
62a021850f
Change-Id: I6baf91aa5b558616e3d30aaa2edbdbc0f47072c3
Treehugger Robot [Thu, 14 Sep 2017 20:28:55 +0000 (20:28 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
Daniel Nishi [Thu, 14 Sep 2017 18:08:00 +0000 (18:08 +0000)]
Merge "Remove outdated storage search results." into oc-mr1-dev
am:
11c325e85d
Change-Id: I8633076bab4293c05a2703ed5cad7f59afdf0fb5
Daniel Nishi [Thu, 14 Sep 2017 18:07:16 +0000 (18:07 +0000)]
Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
am:
f42b529143
Change-Id: I3a8888fe8e555876ed058c29a91f1e9f17d82324
Daniel Nishi [Thu, 14 Sep 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Remove outdated storage search results." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 17:43:27 +0000 (17:43 +0000)]
Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
Erik Kline [Thu, 14 Sep 2017 08:20:30 +0000 (08:20 +0000)]
Merge changes Icd3d09aa,I4b070964 am:
a0661c4fdf am:
d3f4a27c59
am:
de272fcd2a -s ours
Change-Id: Ic79acc4977ea59f92859e41367adc80fc42cb8d9
Erik Kline [Thu, 14 Sep 2017 08:17:00 +0000 (08:17 +0000)]
Merge changes Icd3d09aa,I4b070964 am:
a0661c4fdf
am:
d3f4a27c59
Change-Id: Ia53ed00cc596cdbeff9042d74cdc2852cd352cc9
Erik Kline [Thu, 14 Sep 2017 08:14:09 +0000 (08:14 +0000)]
Merge changes Icd3d09aa,I4b070964
am:
a0661c4fdf
Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642
Treehugger Robot [Thu, 14 Sep 2017 08:10:25 +0000 (08:10 +0000)]
Merge changes Icd3d09aa,I4b070964
* changes:
Include IPv6 DNS servers in wifi details
Separate multiple DNS addresses with newlines.
Erik Kline [Wed, 6 Sep 2017 09:05:48 +0000 (18:05 +0900)]
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
Merged-In: If15181d557e9abce75111a6e1fff4e12586d7dbc
Merged-In: I55fbd611fee9f17215412a76b480cdee96f62b32
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
(cherry picked from commit
9adc5887490953c6d239a634d6ebca4cd3081dc6)
Antony Sargent [Thu, 14 Sep 2017 03:31:27 +0000 (03:31 +0000)]
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
am:
bc6dc5c20c
Change-Id: I64d32e5ac1724ff4c79f1ea4516fa83492a39377
jackqdyulei [Thu, 14 Sep 2017 03:30:48 +0000 (03:30 +0000)]
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev
am:
7853f24405
Change-Id: Ibf4e6c97267fa341913506d258802dc4c6d8d137
Bill Yi [Thu, 14 Sep 2017 03:29:57 +0000 (03:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
93e8800b21 -s ours
Change-Id: I54abc5cc4a026d0ec271d8d01989ab8ec944f4b7
Sundeep Ghuman [Tue, 29 Aug 2017 00:20:02 +0000 (17:20 -0700)]
Separate multiple DNS addresses with newlines.
Bug: b/
65037256
Bug:
65037256
Test: make -j40 RunSettingsRoboTests
Merged-In: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Merged-In: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
(cherry picked from commit
2716e841be8e8bda36c451e1ba9651b37eead560)
Antony Sargent [Thu, 14 Sep 2017 00:04:42 +0000 (00:04 +0000)]
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
Daniel Nishi [Tue, 12 Sep 2017 22:55:46 +0000 (15:55 -0700)]
Close the load screen faster on pre-quota devices.
Pre-quota devices can take an absurd time to load. By loading the screen
once the volume sizes load, we can just show "calculating..." for a
really long time instead of a loading screen.
Change-Id: Id8ab0609c2bc19531d530c6bdf6bff89c5bfac96
Fixes:
64150148
Test: Settings Robotest
TreeHugger Robot [Wed, 13 Sep 2017 23:08:25 +0000 (23:08 +0000)]
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 19:34:27 +0000 (19:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 13 Sep 2017 16:45:46 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I34c1747c9f05b04794b7f563fc19f53467f21980
Emilian Peev [Wed, 13 Sep 2017 08:40:10 +0000 (08:40 +0000)]
Merge "Settings: Add laser sensor preference" into oc-mr1-dev
am:
22eb007eea
Change-Id: I34ab89bd2a175aa77a78a9a46aea75f148bab284
jackqdyulei [Wed, 13 Sep 2017 08:39:31 +0000 (08:39 +0000)]
Merge "Init the pref summary in onCreate()" into oc-mr1-dev
am:
7420c095a9
Change-Id: I3b06886495ba3ec6277c84051bee4974c004c9a1
Xiangyu/Malcolm Chen [Wed, 13 Sep 2017 08:39:05 +0000 (08:39 +0000)]
Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev
am:
8b6fd21f1e
Change-Id: I1e7c9235b424905f4a0d6fc219b2c8c1e6830cae
Matthew Fritze [Wed, 13 Sep 2017 08:38:40 +0000 (08:38 +0000)]
Merge "Index the System status page" into oc-mr1-dev
am:
6203bde8d3
Change-Id: If4350a9cb90e995aa5095c77570055e464103879
Rebecca Silberstein [Wed, 13 Sep 2017 08:38:14 +0000 (08:38 +0000)]
Merge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev
am:
b975e352a2
Change-Id: I883ab8568ae0393e86de770af08cf7779f18b595
TreeHugger Robot [Wed, 13 Sep 2017 07:19:35 +0000 (07:19 +0000)]
Merge "Settings: Add laser sensor preference" into oc-mr1-dev
edgar.huang [Wed, 13 Sep 2017 03:04:01 +0000 (11:04 +0800)]
Don't need to authenticate fingerprint when the fingerprint list is empty.
Enter into the fingerprint list screen and can authenticate fingerprint still when the list is empty.
Test: manual - enrolling some fingerprints and remove all fingerprintd, touch the fingerprint touch panel and no response.
TreeHugger Robot [Wed, 13 Sep 2017 01:38:20 +0000 (01:38 +0000)]
Merge "Init the pref summary in onCreate()" into oc-mr1-dev
Xiangyu/Malcolm Chen [Wed, 13 Sep 2017 01:07:29 +0000 (01:07 +0000)]
Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 00:06:27 +0000 (00:06 +0000)]
Merge "Index the System status page" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 23:20:03 +0000 (23:20 +0000)]
Merge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev
Daniel Nishi [Tue, 12 Sep 2017 23:05:12 +0000 (16:05 -0700)]
Remove outdated storage search results.
The cache category is gone. Also, downloads no longer comes from that
screen.
Change-Id: Ia9a85b6496b0be3106e0ca8572b7c0aed38f336c
Fixes:
65266640
Test: Manual
jackqdyulei [Tue, 12 Sep 2017 22:59:52 +0000 (15:59 -0700)]
Turn on wakeupAlarm anomaly detector
In ag/
2642771, wakeup alarms is changed to based on screen-off
timebase. After that, all the wakeup alarms will be background
ones.
So it is safe to turn on the wakeupAlarm anomaly detector.
Bug:
65597330
Test: RunSettingsRoboTests
Change-Id: I653d4bbfa671c52890dc6c6b13870c666ba9b944
jackqdyulei [Mon, 11 Sep 2017 21:33:28 +0000 (14:33 -0700)]
Init the pref summary in onCreate()
The visibility of bottom summary in BatteryHistoryPrefence will
be changed dynamically(charging status + flags). Before this cl,
we only update it in a callback, which makes other preference
may have unnecessary moves.
This cl add init method in onCreate(), which removes the uncessary
preference position moves.
Bug:
65529494
Test: RoboTest still pass
Change-Id: I09d2e26fc3caaeb272422997c16957770cdc1d3f
(cherry picked from commit
65dea0a7b2f44422aa3778b6565f1c4b7e5d9eb1)
Matthew Fritze [Fri, 8 Sep 2017 21:05:15 +0000 (14:05 -0700)]
Index the System status page
- Page is found in System > About Phone > Status
The page was simply never indexed.
- Remove the unavailable summary text.
- Suppress IP address because it appears in wifi
settings as well.
Test: make RunSettingsRoboTests
Change-Id: I0c5eb5222fc356dd3686fb84ca47da8e2d3274f5
Fixes:
65443327
Rebecca Silberstein [Fri, 8 Sep 2017 08:02:23 +0000 (01:02 -0700)]
Revert back to isDualBandSupported() for Wifi tethering.
This is needed to maintain OEM compatibility
Bug:
33160120
Test: robotests
Change-Id: Ic302969d33f32da72aee47d29615a250d3d924e2
Malcolm Chen [Tue, 12 Sep 2017 00:48:14 +0000 (17:48 -0700)]
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
Antony Sargent [Mon, 11 Sep 2017 23:43:58 +0000 (16:43 -0700)]
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
debesay guadad [Mon, 11 Sep 2017 21:06:31 +0000 (21:06 +0000)]
Merge "Add ims registration status" am:
9b7479f8a9 -s ours am:
d3c72406b6 -s ours
am:
91b143383c -s ours
Change-Id: Iacba38adf23ae48fa92ca852620fc9232629fa73
debesay guadad [Mon, 11 Sep 2017 20:27:24 +0000 (20:27 +0000)]
Merge "Add ims registration status" am:
9b7479f8a9 -s ours
am:
d3c72406b6 -s ours
Change-Id: I15bdf67a2be0187682a936d3fe8a0ae42d8329b5
Android Build Merger (Role) [Mon, 11 Sep 2017 20:10:25 +0000 (20:10 +0000)]
Merge "Merge "Add ims registration status" into stage-aosp-master am:
af845720f6 am:
99768cc46c -s ours" into oc-mr1-dev-plus-aosp
Maurice Lam [Mon, 11 Sep 2017 20:09:55 +0000 (20:09 +0000)]
Merge "Fix sizing of pattern view" into oc-mr1-dev
am:
adef5b23e0
Change-Id: I63928a5e53bf15b30d50f28fa9c4518503d005d7
debesay guadad [Mon, 11 Sep 2017 20:09:47 +0000 (20:09 +0000)]
Merge "Add ims registration status"
am:
9b7479f8a9 -s ours
Change-Id: I65a6d75b2f2127929794c320fe7596372dd4c6ac
Antony Sargent [Mon, 11 Sep 2017 20:09:25 +0000 (20:09 +0000)]
Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
am:
b8ff97fbd5
Change-Id: I559aa49ff0ef4aa82a6a1fb989d05c81ac7575fe
Maurice Lam [Mon, 11 Sep 2017 20:07:48 +0000 (20:07 +0000)]
Merge "Fix sizing of pattern view" into oc-mr1-dev
Maurice Lam [Fri, 8 Sep 2017 18:57:27 +0000 (11:57 -0700)]
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
Brad Ebinger [Mon, 11 Sep 2017 20:06:21 +0000 (20:06 +0000)]
Merge "Add ims registration status" into stage-aosp-master am:
af845720f6
am:
99768cc46c -s ours
Change-Id: Idcab879ef2b9f1891dbae4309e7a971f48660b97
Brad Ebinger [Mon, 11 Sep 2017 19:54:02 +0000 (19:54 +0000)]
Merge "Add ims registration status" into stage-aosp-master
am:
af845720f6
Change-Id: I5daf6e9a55e10d20fc03be6a54801ad6d6533bf8
TreeHugger Robot [Mon, 11 Sep 2017 19:52:47 +0000 (19:52 +0000)]
Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
Treehugger Robot [Mon, 11 Sep 2017 19:44:31 +0000 (19:44 +0000)]
Merge "Add ims registration status"
Brad Ebinger [Mon, 11 Sep 2017 19:42:37 +0000 (19:42 +0000)]
Merge "Add ims registration status" into stage-aosp-master
Amit Mahajan [Mon, 11 Sep 2017 18:01:35 +0000 (18:01 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." am:
c2c0edff09 am:
6ca28e8362
am:
154779b6af
Change-Id: I90715e84699ac52ce727782917c7a0c75a40e843
jackqdyulei [Mon, 11 Sep 2017 17:53:43 +0000 (17:53 +0000)]
Merge "Make system item has a consistent name." into oc-mr1-dev
am:
9a3cb9b835
Change-Id: I928f4266130d488476aadd6dd61a3ce22c579aa2
Amit Mahajan [Mon, 11 Sep 2017 17:51:18 +0000 (17:51 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." am:
c2c0edff09
am:
6ca28e8362
Change-Id: I7e14539d3b22918c8d4a1aa4d41ba96afe88ca1c
Amit Mahajan [Mon, 11 Sep 2017 17:37:55 +0000 (17:37 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed."
am:
c2c0edff09
Change-Id: If53f719245876dda59b220a9b066f30f1c1e0fbc
TreeHugger Robot [Mon, 11 Sep 2017 17:33:09 +0000 (17:33 +0000)]
Merge "Make system item has a consistent name." into oc-mr1-dev
Treehugger Robot [Mon, 11 Sep 2017 17:21:07 +0000 (17:21 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed."
Antony Sargent [Thu, 7 Sep 2017 23:19:17 +0000 (16:19 -0700)]
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
Amit Mahajan [Thu, 31 Aug 2017 20:59:20 +0000 (13:59 -0700)]
Change to disable mvno data field in ApnEditor if needed.
Test: manual
Bug:
65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
Erik Kline [Mon, 11 Sep 2017 05:00:34 +0000 (05:00 +0000)]
Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev
am:
1b62d99433
Change-Id: If15181d557e9abce75111a6e1fff4e12586d7dbc
TreeHugger Robot [Mon, 11 Sep 2017 04:56:28 +0000 (04:56 +0000)]
Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev
Erik Kline [Wed, 6 Sep 2017 09:05:48 +0000 (18:05 +0900)]
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
Fan Zhang [Fri, 8 Sep 2017 22:04:52 +0000 (22:04 +0000)]
Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
am:
90f9398f4e
Change-Id: Idb6dabf0d06440f3a2aecc2f4488bb98859f2eae
Daniel Nishi [Fri, 8 Sep 2017 22:04:12 +0000 (22:04 +0000)]
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
am:
3315f38c3f
Change-Id: I7f8bfe688afc95a184fc6499b95a3c733cb9c681
TreeHugger Robot [Fri, 8 Sep 2017 21:42:32 +0000 (21:42 +0000)]
Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
Daniel Nishi [Fri, 8 Sep 2017 21:39:16 +0000 (21:39 +0000)]
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
Maurice Lam [Fri, 8 Sep 2017 19:56:09 +0000 (19:56 +0000)]
Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
am:
40e284b196
Change-Id: Ica634ce9776b0b0c30bfb49223a4d1d5fc5398ad
Maurice Lam [Fri, 8 Sep 2017 19:50:52 +0000 (19:50 +0000)]
Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
Andrew Scull [Fri, 8 Sep 2017 19:33:34 +0000 (19:33 +0000)]
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev
am:
0bac26b6cd
Change-Id: I30996559ac5166d4ed2cf59688239effe335a305
TreeHugger Robot [Fri, 8 Sep 2017 19:08:48 +0000 (19:08 +0000)]
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev
Maurice Lam [Thu, 7 Sep 2017 03:52:22 +0000 (20:52 -0700)]
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
Stephen Chen [Fri, 8 Sep 2017 18:55:58 +0000 (18:55 +0000)]
Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev
am:
194638ac78
Change-Id: I6dc3ce13040a0b20b5197c5cfac6bc55b09ab679
TreeHugger Robot [Fri, 8 Sep 2017 18:47:08 +0000 (18:47 +0000)]
Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev
TreeHugger Robot [Fri, 8 Sep 2017 17:14:18 +0000 (17:14 +0000)]
Merge "Add ims registration status" into oc-mr1-dev-plus-aosp
Daniel Nishi [Fri, 1 Sep 2017 22:58:30 +0000 (15:58 -0700)]
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
Andrew Scull [Wed, 6 Sep 2017 16:53:25 +0000 (17:53 +0100)]
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
0aa45bed65f544e68e0d38f255da005b3ce9fddf)
daqi [Fri, 8 Sep 2017 10:16:34 +0000 (10:16 +0000)]
Merge "Fix TrustedCredentialsSettings NPE" am:
c9e532f508 am:
93860b298b
am:
21e55623f2
Change-Id: I38f6f53ffd70f8b1ac67ea3695d2b9d5d4b76509
daqi [Fri, 8 Sep 2017 10:10:16 +0000 (10:10 +0000)]
Merge "Fix TrustedCredentialsSettings NPE" am:
c9e532f508
am:
93860b298b
Change-Id: Ic6fd44c164821fc7c5594b1b5082c2ee6e36aa0f
daqi [Fri, 8 Sep 2017 10:04:17 +0000 (10:04 +0000)]
Merge "Fix TrustedCredentialsSettings NPE"
am:
c9e532f508
Change-Id: I2ce8ea95abbbd1d522be4897069d4515354d3b14
Treehugger Robot [Fri, 8 Sep 2017 09:56:31 +0000 (09:56 +0000)]
Merge "Fix TrustedCredentialsSettings NPE"
Ajay Nadathur [Fri, 8 Sep 2017 06:43:46 +0000 (06:43 +0000)]
Merge "Set title in remote views if present in bundle" into oc-mr1-dev
am:
4ce113d6f8
Change-Id: Iaa650a18bd4efb74e6b903efad0ad1a02865429c
TreeHugger Robot [Fri, 8 Sep 2017 06:36:46 +0000 (06:36 +0000)]
Merge "Set title in remote views if present in bundle" into oc-mr1-dev
Fan Zhang [Thu, 7 Sep 2017 23:06:24 +0000 (16:06 -0700)]
Don't attempt to tint icon if icon is not available
Change-Id: I0aa2a17d51d966dce182381c7bba8913ad997738
Fixes:
65460834
Test: robotests
Jack He [Thu, 7 Sep 2017 23:25:43 +0000 (23:25 +0000)]
Bluetooth: add metrics for pairing with devices without names
am:
5b017f7b05
Change-Id: If74bd132ee1352888a7f9513444e998537f11145
debesay guadad [Fri, 26 Feb 2016 06:49:27 +0000 (14:49 +0800)]
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
debesay guadad [Fri, 26 Feb 2016 06:49:27 +0000 (14:49 +0800)]
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
debesay guadad [Fri, 26 Feb 2016 06:49:27 +0000 (14:49 +0800)]
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
Jack He [Thu, 31 Aug 2017 02:18:40 +0000 (19:18 -0700)]
Bluetooth: add metrics for pairing with devices without names
* Also caches context in onClick() method
Bug:
34685932
Test: make, unit test
Change-Id: I99beab2c85b8e48c4bc41f69146759d4b7c62428
Daniel Nishi [Thu, 7 Sep 2017 17:44:00 +0000 (17:44 +0000)]
Merge "Turn in the work profile's badge." into oc-mr1-dev
am:
6361c9d851
Change-Id: If1df9295530334cf58ffec9577b625fedad7ad4e
Daniel Nishi [Thu, 7 Sep 2017 15:15:16 +0000 (15:15 +0000)]
Merge "Cache storage values for fast loading." into oc-mr1-dev
am:
7fae6c67fb
Change-Id: I5e29852872dd08e0e5bb3f1822127879dc354319
Ajay Nadathur [Thu, 31 Aug 2017 18:37:32 +0000 (11:37 -0700)]
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
daqi [Tue, 5 Sep 2017 01:53:05 +0000 (09:53 +0800)]
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>
Emilian Peev [Wed, 6 Sep 2017 15:47:08 +0000 (16:47 +0100)]
Settings: Add laser sensor preference
Add a switch for enabling/disabling the laser sensor within
developer options.
Test: Manual using setting app, RunSettingsRoboTests
Bug:
64423712
Change-Id: I89a32dfa062fc62c4be096d2e026a32ce9b784ca
TreeHugger Robot [Wed, 6 Sep 2017 23:20:40 +0000 (23:20 +0000)]
Merge "Turn in the work profile's badge." into oc-mr1-dev
Daniel Nishi [Wed, 6 Sep 2017 23:07:14 +0000 (23:07 +0000)]
Merge "Cache storage values for fast loading." into oc-mr1-dev
jackqdyulei [Wed, 6 Sep 2017 21:18:29 +0000 (14:18 -0700)]
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
Alison Cichowlas [Wed, 6 Sep 2017 21:23:52 +0000 (21:23 +0000)]
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
am:
40b8d3d238
Change-Id: Ifb481299638c2bb086270555ef981f0435c34da1
Fan Zhang [Wed, 6 Sep 2017 21:23:04 +0000 (21:23 +0000)]
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
am:
bda6500884
Change-Id: I119661153a87d0ebe67367c7350c2934679902a3