Adrian Roos
70a0ea0e8d
am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
...
* commit '16858164c73f0696d12161e97bad9cb22c55e603':
DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-14 16:27:51 +00:00
Adrian Roos
16858164c7
am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
...
* commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
DO NOT MERGE - Fix keyguard pattern lockout bug
2014-03-13 17:26:26 +00:00
Adrian Roos
91c9561cbe
DO NOT MERGE - Fix keyguard pattern lockout bug
...
(cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
Bug: 13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
2014-03-13 13:42:29 +00:00
Baligh Uddin
da799ef3a0
Import translations. DO NOT MERGE
...
Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
Auto-generated-cl: translation import
2014-02-19 18:54:52 -08:00
Adam Lesinski
898c13df7b
Check feature bits before loading optional services
...
At startup, we check with PackageManager whether a system service is
available before attempting to load it. A system service is available
if its associated feature (similar to hardware features) is present.
This does not remove unavailable services from the compiled jar.
Change-Id: I13571805083aa4e65519a74acb52efd17b9fb3d7
2014-02-05 19:26:40 +00:00
Rakesh Pallerla
b8b7bd3185
Telephony: Modify code to check that PUK code length is always 8.
...
As per 3GPP TS 31.101 Release 11 section 9.6, the number of digits
for UNBLOCK PIN (PUK) is always 8.
Change-Id: I4ea69fd8e2e8e96330d10a67b2d1f5a1859c1016
2014-01-08 19:46:25 +05:30
Baligh Uddin
d6e863a19a
Import translations. DO NOT MERGE
...
Change-Id: Ia1e9dd788744e22237845d094d414dc4f57713be
Auto-generated-cl: translation import
2013-12-26 09:53:23 -08:00
Baligh Uddin
db41eaef90
Import translations. DO NOT MERGE
...
Change-Id: Id35b27dea34c2fbad7dcfe2b30a34b26beb4e989
Auto-generated-cl: translation import
2013-12-18 15:11:27 -08:00
Baligh Uddin
9ad3907169
Import translations. DO NOT MERGE
...
Change-Id: I3065b51a4d5b72fc2dbd65f34f2b7dec89fb37d7
Auto-generated-cl: translation import
2013-12-11 12:55:02 -08:00
Jim Miller
fa0211adc3
am 8d1e86d0: am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev
...
* commit '8d1e86d054c9d2a9bdec2a0c9d454ddf21768031':
Don't show external presentation until keyguard actually shows
2013-11-14 18:24:35 -08:00
Jim Miller
8d1e86d054
am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev
...
* commit '1907c0d280d97776708810c9d24931aa6f818790':
Don't show external presentation until keyguard actually shows
2013-11-14 18:20:53 -08:00
Jim Miller
d31fd404e3
Don't show external presentation until keyguard actually shows
...
The previous code was looking for just the display to turn off.
It should wait until keyguard is actually shown before enabling
the external presentations.
Fix for bug 11694904
Change-Id: Iebf3aa04fc094cd4e5c8f56bc771aca1e5921d04
2013-11-14 16:47:26 -08:00
Jim Miller
dab5ba58fe
am 434b4acb: am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev
...
* commit '434b4acb997484e7a540bf44bebd6b17c63fe270':
Don't show keyguard until the device has been provisioned.
2013-11-14 15:44:51 -08:00
Jim Miller
434b4acb99
am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev
...
* commit '90fa53318d4984dbebfa7964ae1f79f51a130932':
Don't show keyguard until the device has been provisioned.
2013-11-14 15:38:32 -08:00
Jim Miller
299422baeb
Don't show keyguard until the device has been provisioned.
...
This fixes a bug where we'd show keyguard on top of setup.
Fixes bug 11689756
Change-Id: I38ecdafc00fc34fdd79e3ac517042a1e5eea93de
2013-11-14 14:15:02 -08:00
Jim Miller
71fb32e080
am 5305fe3f: am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev
...
* commit '5305fe3f0971274d90d875cfbeffdb18e3b03f09':
Don't set up external displays from binder thread
2013-11-13 17:54:11 -08:00
Jim Miller
fdf7c36daa
am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev
...
* commit '378c804d652f32547d3fe460842e5720b57bd9f1':
Report keyguard as initially showing and secure until we know
2013-11-13 17:54:04 -08:00
Jim Miller
5305fe3f09
am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev
...
* commit '39af5a78c073d01539625a9fbbb8511747e2f048':
Don't set up external displays from binder thread
2013-11-13 17:50:26 -08:00
Jim Miller
378c804d65
am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev
...
* commit 'c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d':
Report keyguard as initially showing and secure until we know
2013-11-13 17:50:18 -08:00
Jim Miller
39af5a78c0
Merge "Don't set up external displays from binder thread" into klp-dev
2013-11-14 01:47:32 +00:00
Jim Miller
c8867b2807
Merge "Report keyguard as initially showing and secure until we know" into klp-dev
2013-11-14 01:45:52 +00:00
Jim Miller
80cb9bcfc0
Don't set up external displays from binder thread
...
This fixes a bug where keyguard was attempting to set up
external presentation displays from the binder thread instead
of the UI thread. Bad dog.
Fixes bug 11676486
Change-Id: Iadbe485691acc56a41b23219fe399f7eda40cb7c
2013-11-13 16:47:20 -08:00
Jim Miller
e5f17ab5a6
Report keyguard as initially showing and secure until we know
...
This fixes a bug where an app calls KeyguardManager.isLocked()
before keyguard has had a chance to show. The fix is to assume
keyguard is showing and secure until we know otherwise.
Fixes bug 11670159
Change-Id: Ifbe4cdf40e3b76d2069ecace940f85fa58f31187
2013-11-13 15:40:48 -08:00
Jim Miller
3b44dd88a5
am 291b7f56: am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev
...
* commit '291b7f56159a942911c5e83c42b89ecd2440708c':
Enable fast camera transition when launched from navbar
2013-11-13 14:32:35 -08:00
Jim Miller
291b7f5615
am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev
...
* commit '3714473f1a077cae6eca3079da67a7dd09dcff65':
Enable fast camera transition when launched from navbar
2013-11-13 14:28:06 -08:00
Jim Miller
13c7984d2d
am cefe47c0: am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev
...
* commit 'cefe47c0d3471aedd4f7d4d3b5137a2a95161ad4':
Reduce camera launch time by about 250ms.
2013-11-13 14:27:58 -08:00
Jim Miller
cefe47c0d3
am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev
...
* commit '9c8d56a692198a3fc1629a0407ea6027f04e9a91':
Reduce camera launch time by about 250ms.
2013-11-13 14:24:26 -08:00
Jim Miller
3714473f1a
Merge "Enable fast camera transition when launched from navbar" into klp-dev
2013-11-13 22:23:34 +00:00
Jim Miller
c816b8eedb
Enable fast camera transition when launched from navbar
...
This reduces the camera transition timeout to 0 if launched
from the navigation bar. The transition cannot be aborted once
launched.
Change-Id: I7c376fbb90fd51cd301ef49fbd3411370bc2e4b5
2013-11-12 19:52:12 -08:00
Jim Miller
aa89847f4e
Reduce camera launch time by about 250ms.
...
This reduces the amount of time available to the user to cancel
launching the camera in order to improve average launch time.
It also increases the threshhold for flings and motions to prevent
unintentional launches which are costly in terms of falsing.
Fixes bug b/11657355
Change-Id: I852abbe3ce8ddddcb65f3a48a2f8111d20126189
2013-11-12 18:14:26 -08:00
Jim Miller
7aa535a863
am 01edb226: am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev
...
* commit '01edb22617a96502dfb5297eff1cdf5f265299e2':
Restore permission check in keyguard.
2013-11-08 16:27:38 -08:00
Jim Miller
01edb22617
am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev
...
* commit 'ed7376fc4829e93f5f2d3037633a37d652a13a7c':
Restore permission check in keyguard.
2013-11-08 16:25:06 -08:00
Jim Miller
505329b21b
Restore permission check in keyguard.
...
Fixes bug 11584685
Change-Id: I80621f5608505bdc365930e0276c297c0d5bff67
2013-11-08 14:08:10 -08:00
Jim Miller
c9fd186b46
am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev
...
* commit '44ee0fb144947206713e6527a5227fd44e2d4e1e':
Delay tearing down external displays until keyguard finishes
Show keyguard scrim on external displays while keyguard showing
2013-11-08 11:35:18 -08:00
Jim Miller
44ee0fb144
am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev
...
* commit 'c55edb266f96364277b4a3552295c94363d847fb':
Delay tearing down external displays until keyguard finishes
Show keyguard scrim on external displays while keyguard showing
2013-11-08 11:01:57 -08:00
Jim Miller
0b9d8accc5
Delay tearing down external displays until keyguard finishes
...
This waits until the keyguard window is actually removed before turning
off external presentations to avoid flashing the user's password.
Fixes bug 11562369
Change-Id: I74bfc0d5e23dccc5a8628abfe02868c71c371f6e
2013-11-07 19:15:49 -08:00
Jim Miller
3192148fb4
Show keyguard scrim on external displays while keyguard showing
...
Fixes bug 11562369
Change-Id: I577f9d3683e62689954b4640601b3f360b78cb31
2013-11-07 18:44:56 -08:00
Jim Miller
eaacc7c1ba
am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
...
* commit 'bb78ae9eedce1136410be326274b5304e8e046dc':
Fix scrubbing behavior on keyguard music transport
2013-11-07 14:57:16 -08:00
Jim Miller
bb78ae9eed
am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
...
* commit '8cba0d0b21db0fc4f9006403d6706e5893582dc8':
Fix scrubbing behavior on keyguard music transport
2013-11-07 14:54:37 -08:00
Jim Miller
8cba0d0b21
Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
2013-11-07 22:52:57 +00:00
Jim Miller
cc747ad2da
Fix scrubbing behavior on keyguard music transport
...
This fixes a bug where the music scrub position would snap
back to a previous position. The problem was caused by latency
in the music application responding to scrub position changes.
The latency would mean that we'd get a response periodically
to some historical scrub position change.
Since we can't know when the state will become stable, we
just wait a little bit since the last update change before
continuing to update the scroll position.
In order to keep the music client from falling behind, we
throttle scrub updates.
Fixes bug 11351267
Change-Id: I6204833328751d1da781b4e078a2d557c1f93ff3
2013-11-06 17:53:32 -08:00
Ruben Brunk
df049d6f22
am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
...
* commit '9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43':
Disable face unlock when returning from camera.
2013-11-06 15:30:26 -08:00
Ruben Brunk
9aed2ae0bd
am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
...
* commit 'e77d2a9c62e747902bc53d40e303214705702b00':
Disable face unlock when returning from camera.
2013-11-06 15:26:48 -08:00
Ruben Brunk
e77d2a9c62
Merge "Disable face unlock when returning from camera." into klp-dev
2013-11-06 23:22:55 +00:00
John Spurlock
cd6258b50f
am 20dc4923: am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev
...
* commit '20dc49235e213d40f75dca9005e0e248931ceff4':
Fix lockscreen camera preview position in RTL.
2013-11-06 13:55:18 -08:00
John Spurlock
20dc49235e
am 10b9ac80: Merge "Fix lockscreen camera preview position in RTL." into klp-dev
...
* commit '10b9ac807f7cc0817e8dd4b96d587ccd41f8f177':
Fix lockscreen camera preview position in RTL.
2013-11-06 13:52:15 -08:00
John Spurlock
10b9ac807f
Merge "Fix lockscreen camera preview position in RTL." into klp-dev
2013-11-06 21:48:41 +00:00
Jim Miller
5a31605a03
am 78244c83: am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev
...
* commit '78244c83fb633895c95f3c93ab874be979cf42e3':
Fix issue where transport control shows up off-screen on tablets
2013-11-06 13:22:16 -08:00
Jim Miller
78244c83fb
am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev
...
* commit '322934699433d703fa35505d72028abbcf8ce45f':
Fix issue where transport control shows up off-screen on tablets
2013-11-06 13:19:27 -08:00
Jim Miller
3229346994
Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev
2013-11-06 21:15:17 +00:00