OSDN Git Service
Adrian Roos [Fri, 21 Jul 2017 15:09:40 +0000 (15:09 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev am:
5f62026b4e
am:
4c535d5580
Change-Id: I2c7bf05d801323121ea2f57c5ed191553b5e05bb
Adrian Roos [Fri, 21 Jul 2017 14:59:11 +0000 (14:59 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
am:
5f62026b4e
Change-Id: I70c0f6e119344358ef460c994adc6189d396400b
TreeHugger Robot [Fri, 21 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
Geoffrey Pitsch [Fri, 21 Jul 2017 14:11:40 +0000 (14:11 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev
am:
2d3356375a
Change-Id: I76dc18d9216213b1308c9f54dcf9adcb355c3300
TreeHugger Robot [Fri, 21 Jul 2017 14:02:59 +0000 (14:02 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev
Suprabh Shukla [Fri, 21 Jul 2017 09:43:05 +0000 (09:43 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev am:
928aad3e4d
am:
e7e68b8991
Change-Id: Ib74abddd20d84e1841564598161fe916f9b14ca3
Suprabh Shukla [Fri, 21 Jul 2017 09:39:57 +0000 (09:39 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev am:
928aad3e4d
am:
ab0e78c4b4
Change-Id: Iaf833dd548543d7b0f8e6353080692fbb3ab7cd2
Suprabh Shukla [Fri, 21 Jul 2017 09:34:47 +0000 (09:34 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
am:
928aad3e4d
Change-Id: Id1796f42598f56a59beda381388448eefd6353cc
Suprabh Shukla [Fri, 21 Jul 2017 09:34:47 +0000 (09:34 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
am:
928aad3e4d
Change-Id: I11c65cd3194427fc43fe0cea445715d1f8ce2254
TreeHugger Robot [Fri, 21 Jul 2017 09:28:52 +0000 (09:28 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
Adrian Roos [Wed, 19 Jul 2017 16:08:07 +0000 (18:08 +0200)]
Flicker free screen-on from AOD
When pulsing from AOD, we force the display OFF first. This allows
us to transition smoothly from AOD.
Also, we add a scrim transition for whenever we are waking up from
dozing. This relies on I4f3a863709a970f0fc8682c0a0c3547886e1fd0f
which forces the DOZE -> ON transition through OFF first.
Also fixes the WAKE_AND_UNLOCK transition that happens when waking
up with the fingerprint sensor.
Also fix an issue where KeyguardViewMediator's mWakeAndUnlocking
was cleared in onScreenTurnedOff; this should have been added to
the wakefulness lifecycle instead and now that the AOD -> ON transtion
dispatches the screen off callback it broke the fingerprint unlock
transition.
Fixes:
35849781
Fixes:
63887857
Fixes:
63783651
Fixes:
63727166
Test: AOD, receive notification; AOD, unlock with fingerprint; AOD, wake to lockscreen. Verify that everything is flicker-free.
Change-Id: I7d539db80a1c7e9216cf4c5c1e6d314c1893f12d
Hugo Benichi [Fri, 21 Jul 2017 08:33:46 +0000 (08:33 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035 am:
3d423c9c39 am:
8b8a0ef586
am:
34ad34d199
Change-Id: Icf07be6dcb2bb87307b87af4ffed7d77413c49c7
Hugo Benichi [Fri, 21 Jul 2017 08:26:49 +0000 (08:26 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035 am:
3d423c9c39
am:
8b8a0ef586
Change-Id: I63414de17f71be8f8e24296ba820f5e855f2975f
Hugo Benichi [Fri, 21 Jul 2017 08:21:48 +0000 (08:21 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035
am:
3d423c9c39
Change-Id: If8173e2b320e252ac9dcb95d1967472d505f1121
Hugo Benichi [Fri, 21 Jul 2017 08:15:20 +0000 (08:15 +0000)]
Merge "IpManagerTest: fix flaky test for real"
am:
e0a743d035
Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41
Treehugger Robot [Fri, 21 Jul 2017 08:07:40 +0000 (08:07 +0000)]
Merge "IpManagerTest: fix flaky test for real"
Android Build Merger (Role) [Fri, 21 Jul 2017 05:23:42 +0000 (05:23 +0000)]
Merge "Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe" into oc-mr1-dev am:
5f927337c0" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 21 Jul 2017 05:23:00 +0000 (05:23 +0000)]
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe am:
30f2df2f34" into oc-mr1-dev-plus-aosp
Amith Yamasani [Fri, 21 Jul 2017 05:22:14 +0000 (05:22 +0000)]
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe" into oc-mr1-dev
am:
5f927337c0
Change-Id: I4007453b4f4df48f5f8a885f624822b49605293e
Amith Yamasani [Fri, 21 Jul 2017 05:21:20 +0000 (05:21 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe
am:
30f2df2f34
Change-Id: Iff9161c952f9327dbe8da34d22c0dc36d6e3d831
Etan Cohen [Fri, 21 Jul 2017 05:19:58 +0000 (05:19 +0000)]
Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev
am:
dde0e6ad21
Change-Id: Iaf93437093fe461d202918d187a89832b0b9ddbc
Android Build Merger (Role) [Fri, 21 Jul 2017 05:17:01 +0000 (05:17 +0000)]
Merge "Merge "NFC DTA Integration" into oc-dr1-dev am:
f8469ccf17 am:
1e43a74a47" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 21 Jul 2017 05:16:27 +0000 (05:16 +0000)]
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe" into oc-mr1-dev
Amith Yamasani [Fri, 21 Jul 2017 05:14:51 +0000 (05:14 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
am:
6b4f0bb6fe
Change-Id: Id069c0fd99a3a1b9ebd429c7f44542a2ae068926
Love Khanna [Fri, 21 Jul 2017 05:14:37 +0000 (05:14 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev am:
f8469ccf17
am:
1d3929d46a
Change-Id: I024c1929515f514746c9e74369a259d231036b9b
Amith Yamasani [Fri, 21 Jul 2017 05:14:33 +0000 (05:14 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
am:
6b4f0bb6fe
Change-Id: I9c71705f57c65fc99da831f9ee382168f131937e
Love Khanna [Fri, 21 Jul 2017 05:14:32 +0000 (05:14 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev am:
f8469ccf17
am:
1e43a74a47
Change-Id: Ic8dee5078c3d977052c5ec4151013bc57358548f
Hugo Benichi [Fri, 21 Jul 2017 05:12:26 +0000 (14:12 +0900)]
IpManagerTest: fix flaky test for real
Commit
c10fe5f46367 tried to fix the flaky unit test for a default
ProvisioningConfiguration but failed to reinitialize the mock class
involved, so that in practice the flaky assertion is as flaky as before.
This patch correctly resets the mock after the default assertions are
done once an IpManager object is created.
Bug:
32561414
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I516b6981f96e83a90cb372a727c41f0b2ea59801
TreeHugger Robot [Fri, 21 Jul 2017 05:14:15 +0000 (05:14 +0000)]
Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev
Love Khanna [Fri, 21 Jul 2017 05:09:02 +0000 (05:09 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
am:
f8469ccf17
Change-Id: I661800e26a8dc66b2a7a7676e0df11d928272f89
Love Khanna [Fri, 21 Jul 2017 05:08:25 +0000 (05:08 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
am:
f8469ccf17
Change-Id: I8acca990e6191360fc3f4f9c668f74d7a06d6a52
TreeHugger Robot [Fri, 21 Jul 2017 05:03:15 +0000 (05:03 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 05:01:38 +0000 (05:01 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
Android Build Merger (Role) [Fri, 21 Jul 2017 02:46:39 +0000 (02:46 +0000)]
Merge "Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am:
860f185c66 am:
ed005b2928" into oc-mr1-dev-plus-aosp
Glen Kuhne [Fri, 21 Jul 2017 02:45:09 +0000 (02:45 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am:
860f185c66
am:
ed005b2928
Change-Id: Ic8fa54bd2058f00c2a78b87a8bdbdcad27f37438
Glen Kuhne [Fri, 21 Jul 2017 02:44:27 +0000 (02:44 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am:
860f185c66
am:
640f04ef38
Change-Id: Icea3ffdcb85dca2d00f4fb10ab1fcd84066a02bf
Glen Kuhne [Fri, 21 Jul 2017 02:37:58 +0000 (02:37 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
am:
860f185c66
Change-Id: I9069d51fa6214d9b78c04eea6ab6adebff13ca2e
Glen Kuhne [Fri, 21 Jul 2017 02:37:55 +0000 (02:37 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
am:
860f185c66
Change-Id: Ie89e7361d90accde957dc6490dc483c4d4885c0e
TreeHugger Robot [Fri, 21 Jul 2017 02:30:17 +0000 (02:30 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
Android Build Merger (Role) [Fri, 21 Jul 2017 01:10:23 +0000 (01:10 +0000)]
Merge "Merge "Do not clear scores during stopTracking." into oc-dr1-dev am:
3b63aa79eb am:
06a6d6bbed" into oc-mr1-dev-plus-aosp
Sundeep Ghuman [Fri, 21 Jul 2017 01:08:47 +0000 (01:08 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev am:
3b63aa79eb
am:
34df6c0af3
Change-Id: I583ac138154f1fbb46c6ad536de7038b1847dda4
Sundeep Ghuman [Fri, 21 Jul 2017 01:08:45 +0000 (01:08 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev am:
3b63aa79eb
am:
06a6d6bbed
Change-Id: I2daefb02101725a180cd11811ba0aee9b94da1e3
Sundeep Ghuman [Fri, 21 Jul 2017 01:02:07 +0000 (01:02 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
am:
3b63aa79eb
Change-Id: I9c24f764d2f94baa183b62c253799a605f22390c
Sundeep Ghuman [Fri, 21 Jul 2017 01:01:52 +0000 (01:01 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
am:
3b63aa79eb
Change-Id: Iab18b4e433aa1de2bb4acde5db2e8b8ea5a56710
TreeHugger Robot [Fri, 21 Jul 2017 00:56:42 +0000 (00:56 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
Android Build Merger (Role) [Fri, 21 Jul 2017 00:18:30 +0000 (00:18 +0000)]
Merge "Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am:
a363ab9d6f am:
82bc67193d" into oc-mr1-dev-plus-aosp
Winson Chung [Fri, 21 Jul 2017 00:16:44 +0000 (00:16 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am:
a363ab9d6f
am:
82bc67193d
Change-Id: I8cf195c277fb03ee8023c8b718baf294bc274230
Winson Chung [Fri, 21 Jul 2017 00:16:39 +0000 (00:16 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am:
a363ab9d6f
am:
65d5b0b93d
Change-Id: I3fb14141b38e3bbbd450ce00235b574b63544645
Winson Chung [Fri, 21 Jul 2017 00:09:53 +0000 (00:09 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
am:
a363ab9d6f
Change-Id: I77df82fb8fab936b4affaf57661a227eefcb06b3
Winson Chung [Fri, 21 Jul 2017 00:09:46 +0000 (00:09 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
am:
a363ab9d6f
Change-Id: I05701052c0eeaef4453f044039f8fe7af2a63a2a
Winson Chung [Fri, 21 Jul 2017 00:03:27 +0000 (00:03 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Bug:
63903843
Test: compiles.
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Amit Mahajan [Thu, 20 Jul 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
37a9991be9
am:
f4292bacf9
Change-Id: I0c41b74751b2605404ef35cb25e6dbbe33408435
Amit Mahajan [Thu, 20 Jul 2017 21:11:34 +0000 (21:11 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
37a9991be9
am:
d57fcca823
Change-Id: Ia636defc0757b0480a6a2b0e160bd848fec8cf99
Amit Mahajan [Thu, 20 Jul 2017 20:59:52 +0000 (20:59 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
37a9991be9
Change-Id: I5b5499ed9528aab6718ffe325afe8f51265fd548
Amit Mahajan [Thu, 20 Jul 2017 20:58:39 +0000 (20:58 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
37a9991be9
Change-Id: Ib0cd3d66a4eef9d93e8f952dfd528d0cf714e8e5
Android Build Merger (Role) [Thu, 20 Jul 2017 20:56:02 +0000 (20:56 +0000)]
Merge "Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am:
2ed613ca80 am:
8b1a5af473" into oc-mr1-dev-plus-aosp
Selim Cinek [Thu, 20 Jul 2017 20:53:05 +0000 (20:53 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am:
2ed613ca80
am:
8b1a5af473
Change-Id: Ic902c6e9c05046bf5b02dc7ab23b943730fce7d7
Selim Cinek [Thu, 20 Jul 2017 20:51:36 +0000 (20:51 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am:
2ed613ca80
am:
0d7ff5328e
Change-Id: Ibb62d63ab18f2d200b4eacd66c260eab7cad0184
Amith Yamasani [Wed, 19 Jul 2017 23:49:52 +0000 (16:49 -0700)]
Handle an edge case that can reset settings provider data
If the AtomicFile does the rename and fails when writing the
original, make sure we can at least use the backup on reboot.
Bug:
63753300
Test: Stop shell, move settings_global.xml to backup, start shell.
Change-Id: I2049b48af05161bb2c68717a71c1700a95150a6c
Amit Mahajan [Thu, 20 Jul 2017 20:47:17 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Mady Mellor [Thu, 20 Jul 2017 20:40:37 +0000 (20:40 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am:
0b8a985cd6
am:
f86be8d22d
Change-Id: Icf84c4641c2d9dd626896e5e18a0308189c3cfd4
Selim Cinek [Thu, 20 Jul 2017 20:39:50 +0000 (20:39 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev
am:
2ed613ca80
Change-Id: I68feaf8262bb23db08199bff874fc871cff1acfb
Selim Cinek [Thu, 20 Jul 2017 20:38:27 +0000 (20:38 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev
am:
2ed613ca80
Change-Id: Id697948b665319b83b6becfa56a0148a13149ae3
Mady Mellor [Thu, 20 Jul 2017 20:32:54 +0000 (20:32 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am:
0b8a985cd6
am:
dbb5c98423
Change-Id: Ia8b077236c115cea8581b53af97f312d10be9080
Android Build Merger (Role) [Thu, 20 Jul 2017 20:30:32 +0000 (20:30 +0000)]
Merge "Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev am:
99cc683647 am:
e7faf1a975" into oc-mr1-dev-plus-aosp
Mady Mellor [Thu, 20 Jul 2017 20:28:01 +0000 (20:28 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev
am:
0b8a985cd6
Change-Id: Ib8d76ea165032175be98e8c1023af6c973be1ee4
Adrian Roos [Thu, 20 Jul 2017 20:27:43 +0000 (20:27 +0000)]
Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev am:
99cc683647
am:
e7faf1a975
Change-Id: Ibad0f3c552e6f88b177d3894232659c45464fe7d
Mady Mellor [Thu, 20 Jul 2017 20:27:38 +0000 (20:27 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev
am:
0b8a985cd6
Change-Id: I94d7856d107dbf0d16f008e131fa09b7b78f748e
TreeHugger Robot [Thu, 20 Jul 2017 20:27:35 +0000 (20:27 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev
Adrian Roos [Thu, 20 Jul 2017 20:27:24 +0000 (20:27 +0000)]
Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev am:
99cc683647
am:
74f09cff14
Change-Id: I5e8fa0c4e382ec77d02211074c2c9005034a6343
Adrian Roos [Thu, 20 Jul 2017 20:18:08 +0000 (20:18 +0000)]
Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev
am:
99cc683647
Change-Id: I37e31c0a9c252439488c2fe64becd5f70ee16c04
Adrian Roos [Thu, 20 Jul 2017 20:17:02 +0000 (20:17 +0000)]
Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev
am:
99cc683647
Change-Id: I647b52f1f47655a2d6f9bf90a0db82866c89e0c1
TreeHugger Robot [Thu, 20 Jul 2017 20:13:30 +0000 (20:13 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:05:44 +0000 (20:05 +0000)]
Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev
Android Build Merger (Role) [Thu, 20 Jul 2017 19:30:39 +0000 (19:30 +0000)]
Merge "Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev am:
91a6a10195 am:
b3d487da64" into oc-mr1-dev-plus-aosp
Selim Cinek [Thu, 20 Jul 2017 19:27:21 +0000 (19:27 +0000)]
Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev am:
91a6a10195
am:
8468fdd403
Change-Id: I21fa0deb6491970e798cfb9317b7794fb1580791
Selim Cinek [Thu, 20 Jul 2017 19:27:21 +0000 (19:27 +0000)]
Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev am:
91a6a10195
am:
b3d487da64
Change-Id: I27b759a6fe843b84c402a9fc72ff6d53ab5797c6
Lucas Dupin [Thu, 20 Jul 2017 19:18:22 +0000 (19:18 +0000)]
Merge "Choose correct icon shade of grey" into oc-dr1-dev am:
1f358f1885
am:
2102a0fb80
Change-Id: Iab989b278e3280e8c28b3db2278ce977b8a67a2f
Selim Cinek [Thu, 20 Jul 2017 19:16:50 +0000 (19:16 +0000)]
Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev
am:
91a6a10195
Change-Id: I7d7434afd13d4f6d6247c801dfa0551ef1b6b792
Selim Cinek [Thu, 20 Jul 2017 19:16:50 +0000 (19:16 +0000)]
Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev
am:
91a6a10195
Change-Id: I22d04dfa022e8547b261b6168b75265fdfcf0dca
Lucas Dupin [Thu, 20 Jul 2017 19:13:11 +0000 (19:13 +0000)]
Merge "Merge "Choose correct icon shade of grey" into oc-dr1-dev am:
1f358f1885" into oc-dr1-dev-plus-aosp
am:
895176dc42
Change-Id: Ifacbf19ba2c740c3713b6c2c149a9e27d357d772
Glen Kuhne [Wed, 19 Jul 2017 21:53:34 +0000 (14:53 -0700)]
Don't set AccessPoint with WifiInfo.INVALID_RSSI
This stops the RSSI of an AccessPoint object being updated from WifiInfo
for the current network, when that WifiInfo does not have a valid RSSI.
This occurs when attempting to connect to a network, and the connection
has not yet been established.
Fixes a UI bug where the signal strength would appear to be zero when
attempting to connect to something, or after failing to.
Bug:
63487286
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Test: Manual. Attempt to connect to network with bad PSK. Observe Signal
strength does not get set to zero.
Change-Id: Ia5343fb6f0935134e6a4f82034de164342fe55d4
TreeHugger Robot [Thu, 20 Jul 2017 19:09:42 +0000 (19:09 +0000)]
Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev
Android Build Merger (Role) [Thu, 20 Jul 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev am:
f62e79791b am:
362a400f09" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 20 Jul 2017 19:07:08 +0000 (19:07 +0000)]
Merge "Merge "Logging improvements for time zone updates" am:
2cae07284d am:
42199bf5a0 am:
80aaf8fa37 am:
26827d8fb3" into oc-mr1-dev-plus-aosp
Rob Carr [Thu, 20 Jul 2017 19:05:32 +0000 (19:05 +0000)]
Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev am:
f62e79791b
am:
362a400f09
Change-Id: I8830c89862bac5c3c6bb52d8072c98b21e1fa7a2
Neil Fuller [Thu, 20 Jul 2017 19:03:49 +0000 (19:03 +0000)]
Merge "Logging improvements for time zone updates" am:
2cae07284d am:
42199bf5a0 am:
80aaf8fa37
am:
26827d8fb3
Change-Id: I67ea4f7f18540938c239c3ba4e9ac59e0ceb7ed7
Android Build Merger (Role) [Thu, 20 Jul 2017 19:02:59 +0000 (19:02 +0000)]
Merge "Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev am:
f62e79791b am:
6b81769b1b" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 20 Jul 2017 18:58:37 +0000 (18:58 +0000)]
Merge "Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am:
afe3eb81da am:
00089101fd" into oc-mr1-dev-plus-aosp
Rob Carr [Thu, 20 Jul 2017 18:57:51 +0000 (18:57 +0000)]
Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev am:
f62e79791b
am:
6b81769b1b
Change-Id: I91010fe17062797bee9d7eae7e7092170ec01f1d
Lucas Dupin [Thu, 20 Jul 2017 18:55:22 +0000 (18:55 +0000)]
Merge "Choose correct icon shade of grey" into oc-dr1-dev
am:
1f358f1885
Change-Id: I5e05e4a5b3fa4bc5a651b7a7a010dbee36300239
Rob Carr [Thu, 20 Jul 2017 18:55:16 +0000 (18:55 +0000)]
Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am:
afe3eb81da
am:
00089101fd
Change-Id: I1a69983fa66a71651be388c5f986136e41f63615
Android Build Merger (Role) [Thu, 20 Jul 2017 18:54:20 +0000 (18:54 +0000)]
Merge "Merge "Choose correct icon shade of grey" into oc-dr1-dev am:
1f358f1885" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 20 Jul 2017 18:53:06 +0000 (18:53 +0000)]
Merge "Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am:
afe3eb81da am:
94e892a3e5" into oc-mr1-dev-plus-aosp
Lucas Dupin [Thu, 20 Jul 2017 18:51:29 +0000 (18:51 +0000)]
Merge "Choose correct icon shade of grey" into oc-dr1-dev
am:
1f358f1885
Change-Id: I8ba10a59644aea26f54831bc0ed0486c782aa29a
Android Build Merger (Role) [Thu, 20 Jul 2017 18:50:41 +0000 (18:50 +0000)]
Merge "Merge "Fixes issue where notification jumps when user is dragging and its updated" into oc-dr1-dev am:
58b0e698fc am:
4254f6e457" into oc-mr1-dev-plus-aosp
Rob Carr [Thu, 20 Jul 2017 18:50:13 +0000 (18:50 +0000)]
Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am:
afe3eb81da
am:
94e892a3e5
Change-Id: I68e83d4db8fe1e1f7196e96a82bc19200bc1af90
Mady Mellor [Thu, 20 Jul 2017 18:47:45 +0000 (18:47 +0000)]
Merge "Fixes issue where notification jumps when user is dragging and its updated" into oc-dr1-dev am:
58b0e698fc
am:
4254f6e457
Change-Id: Ia57e25e0767ced3dd9df518f46be0a99967ac03d
Neil Fuller [Thu, 20 Jul 2017 18:47:23 +0000 (18:47 +0000)]
Merge "Logging improvements for time zone updates" am:
2cae07284d am:
42199bf5a0
am:
80aaf8fa37
Change-Id: I0a9687a2aca7f3d189c8536a915bdf4882526af1
OSDN Git Service
