Commit Graph

29204 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
fa42e774bc Merge "FastScroller: Fix to use appropriate index" 2013-07-08 21:24:06 +00:00
Jean-Baptiste Queru
1e7276ce35 Merge "Fix typo in AlertController.java" 2013-07-08 21:22:18 +00:00
Jean-Baptiste Queru
9775203b61 Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters" 2013-07-08 19:35:36 +00:00
Johan Viktorsson
e9018f7716 Fixed incorrect calculation of dirty invalidation area
Padding was already taken into consideration before calling
invalidateDrawable in ProgressBar.

Change-Id: Id7f23bd15bb19e2294c07adb2acb397100ea97e8
2013-07-01 13:43:19 +09:00
Elliott Hughes
d396a448b2 Switch frameworks/base over from @hidden Charsets to public StandardCharsets.
Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
2013-06-28 16:24:48 -07:00
Kenny Root
a5a2de5508 Merge "Add ALPN support to SSL socket factory" 2013-06-27 21:25:24 +00:00
Kenny Root
100d729026 Add ALPN support to SSL socket factory
This adds the ability to use Application-Layer Protocol Negotiation
(ALPN) through the SSLCertificateSocketFactory. ALPN is essentially
like Next Protocol Negotiation (NPN) but negotiation is done in the
clear. This allows the use of other protocols on the same port (e.g.,
SPDY instead of HTTP on port 80).

Change-Id: Ie62926b455e252c4c98670bbbecc1eb5c6f13990
2013-06-26 10:35:39 -07:00
John Reck
12c4c0e45b Merge "Fix deadlock of WebViewCoreThread" 2013-06-25 22:28:02 +00:00
howardb
5ad2451f9f Correct Date format for el_GR, sv_SE and tr_TR locales
Amend DateFormat.getDateFormat to CLDR data from icu4c
instead of locale specific resource entries which are incorrect
for several locales.

No CTS tests are added as they require changing the locale which
is not currently possible.

Bug: https://code.google.com/p/android/issues/detail?id=56385

Change-Id: Ibd11c7fd9b595e19a3e2bf508e1585aa50067e03
Signed-off-by: howardb <android@howardb.com>
2013-06-17 13:35:29 -07:00
Narayan Kamath
6706ca96b2 Merge "Update HttpResponseCache to use the new cache API." 2013-06-13 09:26:34 +00:00
Narayan Kamath
68a3cd7955 Update HttpResponseCache to use the new cache API.
The new API was introduced in

https://android-review.googlesource.com/#/c/59985/

Change-Id: Ie64de7fc64b818bebf1077dff407813865769387
2013-06-12 15:48:18 +01:00
Adam Powell
2756293910 Fix incorrect fragment animation used for hiding fragments
Mirror of support lib patch
https://android-review.googlesource.com/#/c/60032/ into
frameworks/base.

Change-Id: I8d1cb2e217721336674b8e3e2ef8722a8d9baefd
2013-06-07 10:19:22 -07:00
Elliott Hughes
fa6d6256e9 Merge "change "next" to "done" in minute IME option under 24-hour format" 2013-06-05 23:20:37 +00:00
Jeff Brown
3422ceb6ba Merge "Bug fix for building the hover target list" 2013-05-28 20:04:23 +00:00
Jeff Brown
e2a281ca85 Merge "Add additional Method that check whether a table is empty or not" 2013-05-28 19:55:26 +00:00
Dianne Hackborn
f46449abed Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 2013-05-26 06:59:30 +00:00
Dianne Hackborn
0a40bef955 Merge "Fix CalendarView to show the month title properly." 2013-05-26 06:58:14 +00:00
Dianne Hackborn
f9b41efe17 Merge "Don't include flags in configuration change if their value hasn't changed." 2013-05-26 06:57:05 +00:00
Dianne Hackborn
fee6d0cb1e Merge "Fix documentation of requestCode parameter." 2013-05-26 06:56:03 +00:00
Robert Greenwalt
a34b531bb6 Merge "EthernetDataTracker: Set network available on connected" 2013-05-15 16:39:05 +00:00
Danny Baumann
e7123a6601 Don't include flags in configuration change if their value hasn't changed.
This makes the check in updateFrom() match the logic in diff().

Change-Id: I3ab4e8460f7fbf985ef55b9514a8aa90d401d486
2013-05-15 11:12:42 +02:00
Craig Mautner
4754f401a9 Merge "Avoid NullPointerException in getHandler()" 2013-05-10 19:50:39 +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
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
Yuya Aoki
dae43b16a7 Fix deadlock of WebViewCoreThread
There was a deadlock in destroy process.
Investigation showed that WebViewCoreThread is waiting some
callbacks but in this case WebViewCoreThread can not resume
itself not to call notify method.

Flow:
1. CallbackProxy.sendMessageToUiThreadSync
2. WebViewClassic.destroy()
3. CallbackProxy.blockMessages()
4. CallbackProxy.handleMessage is called via MainThread
5. The WebViewCoreThread deadlock is occured.

The cases we have to call notify method are followings.
OVERRIDE_URL
CREATE_WINDOW
SAVE_PASSWORD
NOTIFY
OPEN_FILE_CHOOSER
JS_ALERT
JS_CONFIRM
JS_PROMPT
JS_UNLOAD
JS_TIMEOUT

Change-Id: I9d95ae500bf6338d77b32b5fa15de7cff5720d0f
2013-05-01 14:56:22 +09: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 2b3cef0dd7

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
Kenny Root
28b1f0ee02 Don't use X509CertImpl directly
Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
2013-04-29 13:27:39 -07:00
Carsten Hauge
b2e61e44e9 Avoid IllegalArgumentException in Preference.java compareTo()
In some situations the collection.sort() algoritm fails in compareTo()
with a: java.lang.IllegalArgumentException: Comparison method violates
its general contract!, due to a more strict validation of the compare
contract.
This strict validation was introduced in java 1.7.
See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6804124
This fix should prevent the sorting from crashing.

Change-Id: I64230e7f62f83c99d7a6274964bb2988ae843826
2013-04-29 11:17:54 +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
Ian Rogers
be4536d214 Merge "Adding matching @deprecated." 2013-04-23 15:13:05 +00:00
Alex Klyubin
48a06e7407 Human-readable POSIX capabilities for SystemServer.
Change-Id: I8fecdc55b2cf0041ceed643eb48df53d22ecd600
2013-04-22 14:29:23 -07:00
Michael Wright
abc2763e45 Merge "KeyEvent: update comment" 2013-04-21 05:34:28 +00:00
Ian Rogers
c2a3adbd56 Adding matching @deprecated.
Bug: 8657266
Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c
2013-04-19 11:31:48 -07:00
Satoshi Kataoka
1a546dca77 Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar." 2013-04-18 17:43:38 +00:00
Kenny Root
4622351159 keystore: Add flag for blobs to be unencrypted
In order to let apps use keystore more productively, make the blob
encryption optional. As more hardware-assisted keystores (i.e., hardware
that has a Keymaster HAL) come around, encrypting blobs start to make
less sense since the thing it's encrypting is usually a token and not
any raw key material.

(cherry picked from commit a3788b00bb)

Bug: 8122243
Change-Id: Ifc1c64743651b23a4eace208ade0176af47ea989
2013-04-15 11:09:29 -07:00
Chirayu Desai
61c37ae7ca KeyEvent: update comment
Change-Id: I1ea491e7e23670bf0ea83392710010b557803178
2013-04-15 20:12:30 +05:30