95084 Commits

Author SHA1 Message Date
Conley Owens
d40c41df00 Merge "Track libcore changes." 2013-05-13 21:48:20 +00:00
Elliott Hughes
0d5dee2bc3 Track libcore changes.
Bug: 3484927
Change-Id: Ifbbde9c7cbba1bccd5e1902ad5a2890bff2b2627
2013-05-13 14:15:39 -07:00
Elliott Hughes
ebda92b84a Merge "Track libcore cleanup." 2013-05-11 06:51:39 +00:00
Elliott Hughes
4dbfe64675 Track libcore cleanup.
Change-Id: If9065fd48017af5490d0467a46eacd4ad14e4d96
2013-05-10 23:47:08 -07:00
Elliott Hughes
37dbac9c40 Merge "Expose @SafeVarargs." 2013-05-11 05:59:14 +00:00
Brian Carlstrom
94f55b30e3 Merge "Tracking libnativehelper dependencies" 2013-05-11 05:34:04 +00:00
Brian Carlstrom
fde1f91d9b Tracking libnativehelper dependencies
Change-Id: I05ec62c43fbe5f8ba23256abac7271ca0b1a7242
2013-05-10 21:16:12 -07:00
Elliott Hughes
40d6715dbb Expose @SafeVarargs.
Bug: 3484927
Change-Id: I8ac70b6a102ebf87c51c76935bd87a21f6c17506
2013-05-10 17:20:38 -07:00
Robert Greenwalt
6f8fb9594f Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks" 2013-05-10 22:41:10 +00:00
Dmitry Shmidt
00ee47ead4 Merge "framework/base: Handle ASSOC-REJECT events" 2013-05-10 22:35:23 +00:00
Robert Greenwalt
408ad99dd3 Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails." 2013-05-10 22:15:27 +00:00
Conley Owens
d702e48c13 Merge "Expose AutoCloseable." 2013-05-10 22:11:46 +00:00
Elliott Hughes
10b802889b Expose AutoCloseable.
Bug: 3484927
Change-Id: I769c19ffbefb29ce11b828589f3533c24d134242
2013-05-10 14:21:30 -07:00
Craig Mautner
4754f401a9 Merge "Avoid NullPointerException in getHandler()" 2013-05-10 19:50:39 +00:00
Partha N
ee011077df Enable Opportunistic Key Caching on WPA2-Enterprise Networks
Add a "proactive_key_caching=1" line to every network segment config that represents a
WPA2-Enterprise network. This enables Opportunistic Key Caching for all eligible
WLANs.

Replaced TABs with spaces.

Change-Id: Ia529dcd1dee7a21a68c80de05a9f590ddd944d4c
Signed-off-by: Partha N <parthan@gmail.com>
2013-05-10 07:53:26 -07:00
Deepthi Gowri
c1b631e757 framework/base: Handle ASSOC-REJECT events
Disable current network and enable other saved networks(if any)
once number of ASSOC-REJECTs on an attempt to connect to a corresponding
network exceeds the threshold.

Change-Id: Iac3c1596aa800d93c55b0ac5d8070a058c3842bd
2013-05-09 11:30:26 +05:30
Deepthi Gowri
975b788dab frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
Fix for P2P GO beaconing when 4-way Handshake fails by setting
p2p_group_idle timeout of 10 sec when group is started as a GO
and clear it when AP_STA_CONNECTED event is received.

Change-Id: I40189efc31eeb55e01a95a2a8e9c1a95d929952d
bug: 8871100
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2013-05-09 00:15:33 +00:00
Kenny Root
cd1de3940d Merge "Track change in NativeCrypto" 2013-05-06 22:02:20 +00:00
Kenny Root
4b30e3391b Track change in NativeCrypto
Change-Id: Ic04d4ac5218795fc226f1751b6ae4db1ae73a930
2013-05-06 15:00:58 -07:00
Elliott Hughes
601afaef52 Merge "Someone's IDE chose the wrong Date." 2013-05-06 20:29:09 +00:00
Elliott Hughes
c00df6d52e Someone's IDE chose the wrong Date.
Part 1 of the mystery of the java.sql.Date in preloaded-classes solved.

Change-Id: I33fffec1f86e34167a76afc839d9f4ce31fa31f7
2013-05-06 10:53:28 -07:00
Elliott Hughes
6d82f86fa0 Merge "Show CJK dates as all-numeric in the DatePicker." 2013-05-01 21:12:38 +00:00
Elliott Hughes
949e9df25b Show CJK dates as all-numeric in the DatePicker.
Before, we'd have something like 2006 4月12. After, we have 2006 4 12.
The alternative would require using custom NumberPicker.Formatter instances
for the year and day fields in these locales, and that seems significantly
more disruptive.

Bug: 8766552
Change-Id: I568578aae2f80f2acfc53cd277ef3beae6743472
2013-05-01 14:12:05 -07:00
Koji Fukui
c6031ab7c8 Avoid NullPointerException in getHandler()
mAttachInfo may be set to null by other threads while running
getHandler().

This fix assigns mAttachInfo to a local variable. Checking null pointer
and getting a member variable are executed through the local variable.
This local variable is constant. So NullPointerException doesn't occur
even if mAttachInfo is set to null while running getHandler().

Change-Id: I4013dfb7951bd864628868ed58f8c4f5b7cbd1d3
2013-05-01 17:20:25 +09:00
Dmitry Shmidt
ddf7a0660c Merge "framework:When turn off of SoftAp immediately call turning ON SoftAp" 2013-04-30 20:59:11 +00:00
sunil duttu
aff3bd69d3 framework:When turn off of SoftAp immediately call turning ON SoftAp
Due to sub system restart,There is state change of softAp tether state machine
in tethered state triggering turnoff SoftAp this should be
follwed by turnon softap.

Change-Id: I93051f17bcaae72ae0694f1f23557cc1d3bea280
2013-04-30 13:56:17 -07:00
Elliott Hughes
e3f2735fcf Merge "when locale is non-Enligh, sometimes month spinner needs a number IME" 2013-04-30 20:11:50 +00:00
Romain Guy
6628ee7a46 Merge "HeaderViewListAdapter: Correct thrown error names." 2013-04-30 19:11:22 +00:00
Taylor H. Perkins
62b2bb80f6 HeaderViewListAdapter: Correct thrown error names.
When accessing an invalid entry of the list, an IndexOutOfBounds exception is thrown, not an ArrayIndexOutOfBounds exception.

Change-Id: I3cf59faab004fa6391d84f30f280e0c9bd92dc44
Signed-off-by: Taylor H. Perkins <taylorhp@gmail.com>
2013-04-30 12:04:52 -07:00
Elliott Hughes
afe5681051 Merge "Fix DatePicker's spinner order in various locales." 2013-04-30 18:40:01 +00:00
Elliott Hughes
0bb4c701ba Merge "Use ICU for getDateFormatOrder." 2013-04-30 18:22:18 +00:00
Elliott Hughes
659f145278 Fix DatePicker's spinner order in various locales.
DatePicker always effectively uses yyyy MMM dd, so we need to ask
icu4c what order those should appear in for the user's locale. The
existing DateFormat code was an approximation that worked for en_US
but not for all languages (fa being one example).

Bug: 7207103
Change-Id: I7b12568dbc02522ebad6e1db5f8426109cd6f7ce
2013-04-30 11:11:53 -07:00
Elliott Hughes
edd6f9e688 Use ICU for getDateFormatOrder.
Bug: 7207103
Change-Id: I680bb727cb74cd4b050f237f036d9e696201fc0b
2013-04-30 11:09:53 -07:00
Kenny Root
1f6e789b7e Merge "Track change to JSSE provider" 2013-04-30 04:02:01 +00:00
John Reck
28d91bdbde Merge "Revert "Can not mark the same content of browser page after copy"" 2013-04-30 01:21:31 +00:00
John Reck
8717061f5b Revert "Can not mark the same content of browser page after copy"
This reverts commit 2b3cef0dd74cb9470e5387b015ee7a13af1fff7b

Causes crashes in Email, reverting for now

Change-Id: Ia0286763d0ab1f90c2b6082d44a6ca804769f49c
2013-04-30 01:17:15 +00:00
Kenny Root
12e752225a Track change to JSSE provider
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
2013-04-29 15:15:27 -07:00
Michael Wright
b3f6687756 Merge "input: added support for multiple keyevents" 2013-04-29 22:05:44 +00:00
Diego Torres Milano
2ac9d8d0f0 input: added support for multiple keyevents
- Multiple keyevents can now be send from the command line:

    input keyevent <key code number or name> ...

  Sometimes invoking 'input' repeatedly does not send the events fast
  enough, this change solves the problem by allowing multiple key code
  number or names be added to the command line.

Change-Id: I0d0f34bddd99e0195c9badff2f8b3e2aa9a51737
2013-04-29 22:05:24 +00:00
Christopher Tate
bd1730dec7 Merge "Document the 'aapt dump strings' command" 2013-04-29 21:34:28 +00:00
Kenny Root
d152f7ec1a Merge "Don't use X509CertImpl directly" 2013-04-29 20:54:49 +00:00
Kenny Root
28b1f0ee02 Don't use X509CertImpl directly
Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
2013-04-29 13:27:39 -07:00
Mårten Kongstad
08822df147 Document the 'aapt dump strings' command
Update the usage page for aapt to mention 'strings' as a valid
subcommand to 'dump'.

Change-Id: Iadb2b8ce36951ff36ffbf6b5ea349ba1e2b12582
2013-04-29 09:57:19 +02:00
Elliott Hughes
0bb497b8d1 Merge "Use the newer ZoneInfoDB API." 2013-04-26 18:41:47 +00:00
Elliott Hughes
48289433d8 Use the newer ZoneInfoDB API.
Change-Id: I846c720ae6c262afb4fd7f8a749008c837e76cc4
2013-04-26 11:30:54 -07:00
Victoria Lease
b0e0e54d9d Merge "Can not mark the same content of browser page after copy" 2013-04-26 17:17:39 +00:00
Alex Klyubin
a643652680 Merge "Human-readable POSIX capabilities for SystemServer." 2013-04-24 05:54:47 +00:00
Nick Kralevich
35587a0c47 Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator" 2013-04-23 23:33:52 +00:00
Nick Kralevich
fc17dc2548 Don't set ADDR_COMPAT_LAYOUT on the emulator
Don't work around third party app bugs on the emulator.

Change-Id: I4440fcd56b72e3a74881ddec2a469f037a060525
2013-04-23 15:40:03 -07:00
Ian Rogers
be4536d214 Merge "Adding matching @deprecated." 2013-04-23 15:13:05 +00:00