200 Commits

Author SHA1 Message Date
Paul Lawrence
df42723d6b Merge "Don't double prompt on booting encrypted device" 2014-04-01 15:07:10 +00:00
Adrian Roos
46842d946d Make Keyguard trust aware
Bug: 13723878
Change-Id: If1f54de4112a120848df72192b82e35b341e8ed3
2014-03-31 19:22:48 +00:00
Paul Lawrence
945490c12e Don't double prompt on booting encrypted device
vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.

This is a revision of

https://googleplex-android-review.git.corp.google.com/#/c/418123/

which was reverted. It had two bugs in LockSettingsService.checkVoldPassword.
1) We were not checking password for null, which caused an exception
2) checkPattern/checkPassword return true if there is no saved pattern or password.
   This leads to situations where we get true returned even when the password
   doesn't match. Call the correct one based on what is there, not what vold
   thinks ought to be there.

Bug: 12990752
Change-Id: I05315753387b1e508de5aa79b5a68ad7315791d4
2014-03-28 10:35:44 -07:00
Paul Lawrence
6ee7d25010 Revert "Don't prompt at boot if we already did that when decrypting"
This reverts commit 493e3e7e6523fd94cc1acae3e45935a1227d58c3.

Should fixes

Bug: 13611885
Bug: 13656830
Change-Id: I117c988bb6679f44f8add4fcc18f45cb8238dfb4
2014-03-26 22:31:04 +00:00
Paul Lawrence
717e0f5db7 Merge "Don't prompt at boot if we already did that when decrypting" 2014-03-21 20:40:46 +00:00
Jim Miller
5837a15df1 am 1d6c2573: am aebe3b6c: am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '1d6c2573d4b2824511354d651d7350df327f454f':
  Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 16:10:04 +00:00
Jim Miller
aebe3b6ca4 am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit 'abde0aaa7958976b8f3a66e348d6a5152b0d838e':
  Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 15:47:31 +00:00
Chris Craik
dbd60a71b5 am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '99689a6874c7c465ed97dba625d38e3f1599963f':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
2014-03-20 02:40:14 +00:00
Chris Craik
9208bb4a2b am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '00efaea980c7a9f84f326b22aef740cb5438d282':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
2014-03-20 02:30:15 +00:00
Jim Miller
abde0aaa79 am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '375ff2c4a7b42d6dfd333e0ffa351be88fdab034':
  Attempt to fix a bug where SIM progress dialog gets stuck.
2014-03-20 01:14:40 +00:00
Jim Miller
2598fbd71a Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev 2014-03-20 01:04:13 +00:00
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
Paul Lawrence
493e3e7e65 Don't prompt at boot if we already did that when decrypting
vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.

Needs matching vold changes from
 https://googleplex-android-review.git.corp.google.com/#/c/432050/

Bug: 12990752
Change-Id: I930ed8180cf0b8feb1e58db043d5fb6dff1bab20
2014-03-13 13:48:19 -07: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
Jim Miller
6f29b30dc2 Attempt to fix a bug where SIM progress dialog gets stuck.
The fix makes sure onPause() is called when KeyguardHostView
is removed.

Bug 10323372

Change-Id: I20dd1f68c270adbd4582f2cd8ed9b03964b4477c
2014-03-13 00:13:14 +00:00
Adrian Roos
75fc592847 Merge "Fix bug that allowed avoiding lockout if too many wrong patterns are entered." 2014-03-10 20:07:00 +00:00
Adrian Roos
7c11f8b465 Fix bug that allowed avoiding lockout if too many wrong patterns are entered.
Bug: 13302967
Change-Id: I78404acd700c338e58270471ba307dad9a6884d6
2014-03-10 17:00:11 +01:00
Adrian Roos
6d22d75cba Keyguard Analytics: Remove unused constant.
Change-Id: I6fce6640e391d5f78468212aac7d14a8a6170115
2014-03-03 17:53:44 +01:00
Adrian Roos
58b58fe68b Add session analytics to Keyguard.
On eng and userdebug builds, adds the possibility to track touch and sensor events on the Keyguard.

Change-Id: I9ff9fe5545cb9b7e6833a6af0b5a97a6c204dbd2
2014-03-03 17:09:27 +01:00
Jim Miller
cfa68b977c Disable simple keyguard when notifications enabled.
Enabling notifications on keyguard tripped keyguard into simple
mode which isn't ready for prime-time.  Disabled with variable.

Fixes bug 13172958

Change-Id: Ia281b06d754cd62455010f9e31c0ee81e4937977
2014-02-25 15:36:13 -08:00
Kenny Guy
1a447535ce Hide managed profiles from user switchers.
Hide managed profiles from lockscreen user switcher on tablets.
Hide managed profiles from power menu user switcher on phones.
Add flag to enable multi user ui turned off by default.

Change-Id: I4c69a6f7b0f39c249fc85fd940318df1ddab073f
2014-02-24 19:24:42 +00:00
Dan Sandler
5d7c3cc66c Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
$ adb shell settings put global lock_screen_show_notifications 1

Previously a per-user secure setting
(Settings.Secure.LOCK_SCREEN_ALLOW_NOTIFICATIONS), but this
doesn't really make a lot of sense since this behavior
pertains to areas of the system (keyguard, status bar) that
exist outside of any one user.

This setting now effectively enables notifications on the
secure lockscreen for all users.

Change-Id: I9c5179498dbbba9343184efdedb1587ea862cf96
2014-02-18 17:35:15 -05:00
Jeanette Löfgren
9fc02de33d Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
This is a small fix to the showWallpaper method, in which a power
consumption problem has been introduced. This showWallpaper method
toggles the window flag FLAG_SHOW_WALLPAPER, when album art is being
shown in Lockscreen. It is important to set pixel format to
PixelFormat.OPAQUE if flag FLAG_SHOW_WALLPAPER is not being set.

If not, an application that uses window flag FLAG_KEEP_SCREEN_ON
will prevent the keyguard from going to sleep and drain battery.

Change-Id: I1808be28047977ae5ac4dd1168ea25cac8a55a78
2014-02-15 02:36:57 +09:00
Jim Miller
ba7d94b8f3 Fix problem where input wasn't being requested
This fixes a bug where input wasn't being enabled when the security
method changed.  The solution is to propagate changes back to the parent

Add missing copyright header to simplified keyguard view.

Bugs 12135931, 12879769

Change-Id: I0fc6cf8ef3b628c96a045797a5b9cdecd3a1007a
2014-02-06 16:13:42 -08:00
Jim Miller
5e612cf078 Add KeyguardSimpleHostView and make it the default
This adds a simplified KeyguardHostView that's intended to
be used as an overlay or dialog for asking the user's
credentials.

Bug 12135931

Change-Id: Iecede0715d671e88024e7bb77e7432cd1c7ec356
2014-02-06 16:13:42 -08:00
Jim Miller
3eb4971b67 Move launch, verification and menu logic to base class
- Add simplified KeyguardHostView
- Move common functions to KeyguardViewBase.java
- Create new KeyguardSimpleHostView class for simplified view
implementation.

Bug 12135931

Change-Id: I8d6b0a61c36a0c7ceb87da4da54b1dfbed0054ff
2014-02-06 16:13:41 -08:00
Dan Sandler
a5e0f415d3 SystemUI support for notification visibility.
In this implementation, DISABLE_NOTIFICATION_TICKER (which was never
really used on its own and can be safely subsumed by
DISABLE_NOTIFICATION_ICONS) is now DISABLE_PRIVATE_NOTIFICATIONS;
when this SystemUI bit is set by the keyguard, SystemUI knows to switch
its presentation into "public" mode, in which
VISIBILITY_PRIVATE notifications are replaced with their
publicVersion's contentView (or a placeholder view,
synthesized by SystemUI, that leaks no additional
information about the notification). VISIBILITY_SECRET
notifications are suppressed altogether in this mode.

This behavior is enabled but not activated by default. To
turn it on, run:

  $ adb shell settings put secure lock_screen_allow_notifications 1

and restart SystemUI.

Change-Id: Id660bef7737580e16a83f60567c22b53ee81c602
2014-01-30 13:23:14 -05:00
Jim Miller
5a8daad469 Clean up KeyguardSecurityCallback documentation and add copyright header.
Bug 12135931

Change-Id: I9f2e20fb4c1a2cb6a9fb49f4b6939fd7687ef262
2014-01-28 15:23:24 -08:00
Jim Miller
7751ff6cd0 Move majority of security-related logic from KeyguardHostView
to KeyguardSecurityContainer.

This removes and/or simplifies the interface between modules to
allow easier separation of KeyguardSecurityContainer into a stand-alone
component.

Bug 12135931
2014-01-27 15:21:39 -08:00
Wink Saville
5197d0740c am dafb2420: am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit 'dafb2420a34a5b39aca6ddf993e86778edd76b5d':
  Telephony: Modify code to check that PUK code length is always 8.
2014-01-26 16:58:24 +00:00
Selim Cinek
ed88cee15b Fixed issue on Keyguard camera icon, where dragging on it
did not properly trigger abortion of the camera animation.

Also minorly simplified the touch slop calculation

BUG: 12036618
Change-Id: If01b48c815200066b32a37ffc44949edde1376f9
2014-01-16 11:03:20 -08: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
Andres Morales
38a7ed05f8 Adding INfcUnlockSettings and NfcUnlock interface class.
Change-Id: Ie55a5d4bb58c2944952fc84cce32d3573a3a1a22
2013-12-09 14:41:01 -08:00
John Spurlock
6090995951 Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
2013-11-20 11:31:47 -05: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
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
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
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
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
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
e77d2a9c62 Merge "Disable face unlock when returning from camera." into klp-dev 2013-11-06 23:22:55 +00: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
3229346994 Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev 2013-11-06 21:15:17 +00:00