114336 Commits

Author SHA1 Message Date
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
Jeff Sharkey
24fe066ee2 Merge "Fix am argument ordering documentation." into klp-dev 2013-11-14 19:01:07 +00:00
Jeff Sharkey
7625c84045 Fix am argument ordering documentation.
Bug: 11690520
Change-Id: I84b10a6eb6e6404212ab9737e7cee1f1ad4d5309
2013-11-14 10:57:55 -08:00
Matthew Williams
c68bb18244 Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev 2013-11-14 17:18:58 +00:00
Satoshi Kataoka
5fd5aa3d06 Fix compatibility issue on InputMethodSubtype
Bug: 11032428
Change-Id: If722bbbfb69d00e1830007582d46a33319203eea
2013-11-14 15:08:39 +09:00
Adam Powell
48d2bcf2ce Reset padding flags when set programmatically or implicitly from background
Bug 11673480

Change-Id: I4f33c7ae46e937302e625bf1f3260adb25843645
2013-11-13 19:21:50 -08:00
Matthew Williams
a7456e46f4 SyncManager now returns copy on getCurrentSyncs()
Bug:11559103
Added a new getCurrentSyncsCopy() that is public. The other version
is needed for internal SSE calls.

Change-Id: I0287f039a6f75abf04b65b85cb30f78353aeef4f
2013-11-13 18:17:54 -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
Svetoslav
4e04115052 Merge "Avoid NPE and add a warning log if a printing app misbehaves." into klp-dev 2013-11-14 01:46:47 +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
Svetoslav
afd1967503 Avoid NPE and add a warning log if a printing app misbehaves.
An app can print only from an activity. If the activity is finished
before printing completes we destroy the PrintDocumentAdapter. The
app may however invoke some of the print callbacks after destruction
resulting in a NPE. This change checks if the adapter is destroyed
and if so does not crash while printing a meaningful log error with
the mistake of the app developer.

bug:11675274

Change-Id: I66539cfbd7583f52cb863a84ef8e40856f92ceed
2013-11-13 17:31:15 -08:00
Glenn Kasten
c32d89f63f Merge "Replace keyboard sounds with latest (softer) design" into klp-dev 2013-11-14 01:09: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
Vinit Deshapnde
75c12de0cd Merge "Increase Reject threshold for disabling networks" into klp-dev 2013-11-14 00:36:54 +00:00
Lajos Molnar
7e11b16b9f VideoView: expand documentation on state save/restore limitations
Change-Id: I46f231d314fc4ae8d9d11389aa62a3e2698122ed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412889
2013-11-13 16:27:30 -08:00
Robert Greenwalt
594eeb082e Merge "Fix for the invalid Global Proxy Setting" into klp-dev 2013-11-14 00:22:46 +00:00
Craig Mautner
1f0f9fa949 Merge "Add null pointer check." into klp-dev 2013-11-14 00:15:55 +00:00
Raj Mamadgi
92d02491ad Fix for the invalid Global Proxy Setting
Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568

Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
2013-11-14 00:08:21 +00:00
Vinit Deshapnde
8fa06ee413 Increase Reject threshold for disabling networks
This change modifies a framework optimization. The framework optimization
disables a network when an access point repeatedly rejects requests
to associate with it. This change has some problems; one being that
it counts the rejects for all networks, and not for a specific network.
This incorrectly penalizes last networks at times; and since the current
threshold is 4 rejects, the probability of penalizing wrong networks
is high. This change ups that number to 16 to reduce that probability.

Bug: 11654725

Change-Id: I7150a9ccbb54bac44f2c2ba100fb6617ded33616
2013-11-13 15:48:11 -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
Ed Heyl
a951fa56f1 merge in release branch changes (no-op). 2013-11-13 15:19:22 -08:00
Craig Mautner
0e823a450a Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev 2013-11-13 23:11:12 +00:00
Craig Mautner
ada62fca51 Add null pointer check.
Fixes bug 11673948.

Change-Id: I60b590b9793ae1b8d5c3d343f4bb6cb40ba4a092
2013-11-13 15:09:55 -08:00
Baligh Uddin
dc0acc6f5d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 22:39:40 +00:00
Jeff Sharkey
711d390be9 Merge "Small DocumentsProvider doc improvements." into klp-dev 2013-11-13 22:31:01 +00: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
9c8d56a692 Merge "Reduce camera launch time by about 250ms." into klp-dev 2013-11-13 22:22:13 +00:00
Svetoslav Ganov
d697ba73b5 Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 2013-11-13 22:19:57 +00:00
Baligh Uddin
b4aac8d832 Import translations. DO NOT MERGE
Change-Id: I11d764583416d7fb4dfc85ebe81a98b6a1267424
Auto-generated-cl: translation import
2013-11-13 13:39:45 -08:00
Jeff Sharkey
3b945405cf Small DocumentsProvider doc improvements.
Bug: 11670294
Change-Id: I5fb91c7665fc2a4531059ef9f2de0972ebabe1ea
2013-11-13 13:31:17 -08:00
Svetoslav
14f300803b Merge "Update the PrintDocumentAdapter docs." into klp-dev 2013-11-13 21:30:58 +00:00
Craig Mautner
5c7bd01705 Keyguard isn't visible if it hasn't been drawn.
Reduces jank in multiuser lock from QuickSettings. The launcher and
wallpaper were being hidden as soon as the surface for the keyguard
was created. Now they are not hidden until the keyguard has been
drawn. This still leaves a short time where there is a black screen
but it is considerably shorter than it was. Comparable to jb now.

Fixes bug 11046339.

Change-Id: I349d95dba72da27e5c05a7a64c95a2774d17a34e
2013-11-13 13:09:35 -08:00
Baligh Uddin
2a22627e17 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 21:04:25 +00:00
Baligh Uddin
5cc3ddf16f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 21:04:07 +00:00
Baligh Uddin
bc3be0e3dc Import translations. DO NOT MERGE
Change-Id: I3b40e99b029a65ade59ec8f7ad06c0a143895269
Auto-generated-cl: translation import
2013-11-13 12:24:32 -08:00
Baligh Uddin
9f500fe103 Import translations. DO NOT MERGE
Change-Id: Id312643b2e858fa84f81b37975a1757ff1773b87
Auto-generated-cl: translation import
2013-11-13 11:54:28 -08:00
Keiji Ariyama
1a8c7135f0 Fix NPE at PrintSpooler in Japanese environment.
MediaSize ID have to be upper cases.

Change-Id: I84af01dbd185df210b5ebb1de282a4091e06df05
Related-issue: https://code.google.com/p/android/issues/detail?id=61984
2013-11-13 11:43:26 -08:00
Christopher Tate
0b2c2b1005 Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 2013-11-13 19:33:46 +00:00
Daniel Sandler
31f7c912f0 Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 2013-11-13 19:32:42 +00:00
Daniel Sandler
424984172b Merge "DessertCase fixes:" into klp-dev 2013-11-13 19:32:27 +00:00
Daniel Sandler
f554042a95 Merge "Switch DeadZone to Slog." into klp-dev 2013-11-13 19:32:24 +00:00
John Huang
54ca906604 Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 2013-11-13 19:14:00 +00:00
Glenn Kasten
34262cdfc5 Replace keyboard sounds with latest (softer) design
Make AudioPackage8 (N7 v1) and AudioPackage9 (N10) more like
AudioPackage12_48 (N5).

Bug: 11158758
Change-Id: I55052218f62159fd90efb21be19e19509eb11afe
2013-11-13 09:17:46 -08:00
Jeff Brown
41b92b008e Merge "Finalize assets for screen casting." into klp-dev 2013-11-13 16:51:53 +00:00
John Spurlock
7d667ee2de Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev 2013-11-13 16:41:44 +00:00
Deepanshu Gupta
78cfdf31b7 Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
Issue: https://code.google.com/p/android/issues/detail?id=60167
Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
2013-11-13 18:15:51 +05:30
Jeff Brown
e7ae644522 Finalize assets for screen casting.
Extend wifi display connection timeout.

Show a notification while connecting to wifi display.

Ensure that remote display providers are really trusted before
connecting to them.

Bug: 11257292
Change-Id: Iad0caaa30d7946df818bc75ade071f2e377f8a53
2013-11-13 02:17:53 -08:00
Jean Chalard
218ecd4394 Fix the docs build
Change-Id: I05f1f39aaa9d72201a7fd06377799246039cd505
2013-11-13 15:20:58 +09:00
Jean Chalard
7d57b7a35b Merge "Improve documentation for InputType and EditorInfo." into klp-dev 2013-11-13 05:19:36 +00:00
The Android Automerger
b9480186c9 merge in klp-mr1-release history after reset to klp-dev 2013-11-12 20:00:43 -08:00