Sanket Padawe
cb9d3de032
am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
...
* commit 'f1a9868e18d1feb56434313701faaf52473f0942':
Changes security for Passpoint to EAP security from "Passpoint".
2015-07-14 00:20:55 +00:00
Adrian Roos
60e293cfed
am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev
...
* commit '63d58c0a33655faa1c6dd847d589872ab4d4f375':
Fix flash of uninitialized surface
2015-07-14 00:20:49 +00:00
Sanket Padawe
f1a9868e18
am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
...
* commit '0a66123f62f5d28bbef4f88a32c6de97caab3cfe':
Changes security for Passpoint to EAP security from "Passpoint".
2015-07-13 23:33:40 +00:00
Adrian Roos
63d58c0a33
am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev
...
* commit 'dc445a115fb93d3b6c900cd823032f340cc3cd56':
Fix flash of uninitialized surface
2015-07-13 23:33:35 +00:00
Robin Lee
2d64ad5c9d
am 7321f09f: am 6a5c9370: am 6795a2ae: Check legacy VPN is connected before alerting
...
* commit '7321f09fd7d64ca8883d4fc8d0e43ef16bf72091':
Check legacy VPN is connected before alerting
2015-07-13 22:48:43 +00:00
Jorim Jaggi
9042b4ced7
am 3539d328: am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev
...
* commit '3539d32806b74bbcd6a89aa99ec31c5acc7e0546':
Fix empty keyguard for once and all
2015-07-13 22:48:37 +00:00
Robin Lee
7321f09fd7
am 6a5c9370: am 6795a2ae: Check legacy VPN is connected before alerting
...
* commit '6a5c937042d54d22d79f82772771c99e618a1787':
Check legacy VPN is connected before alerting
2015-07-13 22:34:41 +00:00
Jorim Jaggi
3539d32806
am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev
...
* commit '7f3a15574c0b33c194625046cdc47a76879434db':
Fix empty keyguard for once and all
2015-07-13 22:34:36 +00:00
Sanket Padawe
0a66123f62
am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
...
* commit '233bd3ceffbe247b5230f2832ad63c6cf1d9ed13':
Changes security for Passpoint to EAP security from "Passpoint".
2015-07-13 22:30:37 +00:00
Adrian Roos
dc445a115f
am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev
...
* commit 'd374c20fc9269913d19666f0994268ed457e0d42':
Fix flash of uninitialized surface
2015-07-13 22:30:29 +00:00
Robin Lee
6a5c937042
am 6795a2ae: Check legacy VPN is connected before alerting
...
* commit '6795a2aeafa6df8a5e8e3045d29991d33c8db33f':
Check legacy VPN is connected before alerting
2015-07-13 17:51:02 +00:00
Jorim Jaggi
7f3a15574c
am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev
...
* commit '0c758805b385a5c136b21a2b38e2383c30665282':
Fix empty keyguard for once and all
2015-07-13 17:50:58 +00:00
Geoff Mendal
a8bbc7ac9a
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 22:17:03 +00:00
Geoff Mendal
ec10f5959c
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 22:16:51 +00:00
Geoff Mendal
cc9b8ddde7
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 22:16:37 +00:00
Geoff Mendal
4d64bdbc28
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 22:16:21 +00:00
Geoff Mendal
f841432ec6
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 22:03:48 +00:00
Geoff Mendal
1fc614f862
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 22:03:34 +00:00
Geoff Mendal
466fd56fed
Import translations. DO NOT MERGE
...
Change-Id: I9f34197d5bad1ec32f924cfdb0190a1bc6657579
Auto-generated-cl: translation import
2015-07-11 13:54:43 -07:00
Geoff Mendal
d731317a6a
Import translations. DO NOT MERGE
...
Change-Id: I6a357f6c884a6df2374b5d9607547b1d825b1454
Auto-generated-cl: translation import
2015-07-11 13:47:51 -07:00
Geoff Mendal
66a16ce2d7
Import translations. DO NOT MERGE
...
Change-Id: Ib08162355c40eba8e5eb2c80b8da45cb228486aa
Auto-generated-cl: translation import
2015-07-11 13:42:43 -07:00
Geoff Mendal
da868b9a00
Import translations. DO NOT MERGE
...
Change-Id: Ia6c22efa7d0a9bb73d3d60063228927274209e18
Auto-generated-cl: translation import
2015-07-11 13:39:58 -07:00
Geoff Mendal
205becca0a
Import translations. DO NOT MERGE
...
Change-Id: Ie294e23803870c2283b2002f260dc466294e4161
Auto-generated-cl: translation import
2015-07-11 13:37:08 -07:00
Geoff Mendal
90446a9cd1
Import translations. DO NOT MERGE
...
Change-Id: I44c6ca4646a822b04b8b047e83622b7de1d36b15
Auto-generated-cl: translation import
2015-07-11 13:32:02 -07:00
Geoff Mendal
d7805ef736
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 19:03:37 +00:00
Geoff Mendal
7ff7482604
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 18:57:27 +00:00
Geoff Mendal
a40b3e9616
Import translations. DO NOT MERGE
...
Change-Id: Ia540bc3e4e16261deea98891e52466905bd17d1f
Auto-generated-cl: translation import
2015-07-11 13:18:19 -05:00
Geoff Mendal
7d54030b1c
Import translations. DO NOT MERGE
...
Change-Id: Idc7b4739005f2d06bf0dd38bfdb18f5c205dc5eb
Auto-generated-cl: translation import
2015-07-11 13:12:45 -05:00
Geoff Mendal
388d1cc875
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 17:07:21 +00:00
Geoff Mendal
2154298fd1
Import translations. DO NOT MERGE
...
Change-Id: If92ad99cfc2fab1a96e9bd99d7bbac850cba9bf5
Auto-generated-cl: translation import
2015-07-11 12:06:50 -05:00
Geoff Mendal
efa098a763
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-11 16:57:22 +00:00
Geoff Mendal
5486bbcb9a
Import translations. DO NOT MERGE
...
Change-Id: I787a0e53f646c1b015882b689785f24b641e4eba
Auto-generated-cl: translation import
2015-07-11 11:54:16 -05:00
Geoff Mendal
bc69f1c952
Import translations. DO NOT MERGE
...
Change-Id: I7201c2b8f3e2e5319ed1ca4fd25f6d8987547913
Auto-generated-cl: translation import
2015-07-11 11:51:36 -05:00
Sanket Padawe
233bd3ceff
Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
2015-07-11 01:46:33 +00:00
Adrian Roos
d374c20fc9
Merge "Fix flash of uninitialized surface" into mnc-dev
2015-07-11 00:57:20 +00:00
Adrian Roos
18a0b9e041
Fix flash of uninitialized surface
...
Fixes a bug where during the animation of
the backdrop uninitialized memory was showing
because the backdrop's alpha was zero, so RenderNode
didn't issue any drawing commands.
Bug: 21472158
Change-Id: I7ad6bb64e739059febffca10463c8097693a9563
2015-07-10 15:50:24 -07:00
Robin Lee
6795a2aeaf
Check legacy VPN is connected before alerting
...
Legacy VPN does nothing if the device has no underlying network
connection, so showing this warning in that case is confusing.
Conversely third-party VPN can still be dangerous since a malicious
app will store sensitive information and upload it later.
Bug: 21499103
Change-Id: I25a0d4e1e5b10198cb067f06645f0e5ecf81bf56
2015-07-10 21:22:46 +00:00
Jorim Jaggi
4474f54f4e
Fix empty keyguard for once and all
...
When a Keyguard exit animation was played while the screen was
turning off, the window animation was cancelled. However, since
we didn't reset mPostKeyguardExitAnimation, we thought we need to
apply it again, with a start time of Long.MIN_VALUE. For some reason,
this animation never ended, and it was stuck at the beginning. Thus,
the alpha was 0 and the user just saw a blank wallpaper.
In addition, we also forbid starting the Keyguard exit animation when
the screen is about to turn off.
Bug: 21124013
Change-Id: Ief022c5bd758a9fedcaab3fe9fc385fa4234b37f
2015-07-10 21:06:44 +00:00
Sanket Padawe
194cce695b
Changes security for Passpoint to EAP security from "Passpoint".
...
Bug: 22402754
Change-Id: I3afbb6f3f446657a3e9505122032f4edc6401302
2015-07-10 10:53:31 -07:00
Paul Jensen
ca36baafef
am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
...
* commit '2cb16d2e71398fcb73e3c7ecba093a4bae4490cb':
Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
2015-07-10 15:33:38 +00:00
Paul Jensen
2cb16d2e71
am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
...
* commit '75a43340b675fd13eac05965438aaac2a7164658':
Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
2015-07-10 15:19:43 +00:00
Paul Jensen
75a43340b6
am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
...
* commit '00c64f7ca5b05384dc3c208eff43e0b1a037a7d0':
Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
2015-07-10 15:06:30 +00:00
Paul Jensen
00c64f7ca5
Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
2015-07-10 14:57:13 +00:00
Jorim Jaggi
5175b3c992
am 9acf475c: am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
...
* commit '9acf475c6c9589c5e10ca68cb321de05985b927e':
Fix assist for hardware long-press
2015-07-09 20:00:56 +00:00
Jorim Jaggi
9acf475c6c
am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
...
* commit '35094376726c3a0d4b6fa73ef836f733fad39ae9':
Fix assist for hardware long-press
2015-07-09 19:46:46 +00:00
Jason Monk
f4b54d2d6c
am eddcee21: am 5ef8188f: am 58599104: Merge "Remove data icon for WFC" into mnc-dev
...
* commit 'eddcee213da206a8a7ab789513210fb9bb416536':
Remove data icon for WFC
2015-07-09 19:40:53 +00:00
Jason Monk
f98efaeb7a
am 6f85d1f5: am de5df114: am 8969817a: Merge "Fix roaming icon when not default signal" into mnc-dev
...
* commit '6f85d1f584605c19f1146870cb42d9deb7b44e94':
Fix roaming icon when not default signal
2015-07-09 19:40:46 +00:00
Jorim Jaggi
3509437672
am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
...
* commit '3cc5c24b83edaab66c97b161e25ff0bd93b3e1b4':
Fix assist for hardware long-press
2015-07-09 19:31:54 +00:00
Jason Monk
eddcee213d
am 5ef8188f: am 58599104: Merge "Remove data icon for WFC" into mnc-dev
...
* commit '5ef8188f6c44c9324b1563a3de5c9b3f545bebd2':
Remove data icon for WFC
2015-07-09 19:25:37 +00:00
Jason Monk
6f85d1f584
am de5df114: am 8969817a: Merge "Fix roaming icon when not default signal" into mnc-dev
...
* commit 'de5df114269fd038adfc72c644b138f1da90b7bd':
Fix roaming icon when not default signal
2015-07-09 19:25:32 +00:00