95157 Commits

Author SHA1 Message Date
Elliott Hughes
812990a9e5 Track libcore API update.
Bug: 3484927
Change-Id: I52a37bdeafe431255034543e0fad5f808955309f
2013-07-01 14:46:31 -07:00
Elliott Hughes
e3b94f05b8 Merge "Track libcore API change." 2013-06-29 01:08:25 +00:00
Elliott Hughes
97c538d5f3 Track libcore API change.
Bug: 3484927
Change-Id: If49d0389e4ecb826052e168e070b673894d91318
2013-06-28 18:03:46 -07:00
Elliott Hughes
fca0f92e0a Merge "Switch frameworks/base over from @hidden Charsets to public StandardCharsets." 2013-06-28 23:31:35 +00: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
Elliott Hughes
5216f11e46 Merge "Track libcore API update." 2013-06-28 23:17:20 +00:00
Elliott Hughes
0e88a95480 Track libcore API update.
Bug: 3484927
Change-Id: I77c22d3da7b70d3dae4cf6c1903add948ae39406
2013-06-28 16:08:02 -07:00
Elliott Hughes
ee66531f2f Merge "Track libcore API update." 2013-06-28 22:56:03 +00:00
Elliott Hughes
6859af17ce Track libcore API update.
Bug: 3484927
Change-Id: I684d724000d09a52c840076fab5985242c77c908
2013-06-28 15:28:00 -07:00
Elliott Hughes
505974eb73 Merge "Track libcore API update." 2013-06-28 20:04:29 +00:00
Elliott Hughes
5931afdc0f Track libcore API update.
Bug: 3484927
Change-Id: I22fc7e003c3483a20988e91d2b8824626ec022b1
2013-06-28 10:55:14 -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
Christopher Tate
3e7d034439 Merge "Avoid adding FORWARD_LOCK flag to an updated system app" 2013-06-24 23:02:00 +00:00
Jean-Baptiste Queru
4be48d436b Merge "Lockscreen : Reference correct layout" 2013-06-24 21:15:45 +00:00
Danesh Mondegarian
034ed8f94b Lockscreen : Reference correct layout
Include correct layout for portrait.

Change-Id: I6de511357aec0f4364cd68c3ed740c7d4f47379d
2013-06-24 16:00:35 -04:00
Wink Saville
34fb4eae36 Merge "Fix misspelling of getLteSignalStrenght." 2013-06-21 19:06:54 +00:00
Wink Saville
29c8b00f14 Fix misspelling of getLteSignalStrenght.
Change to getLteSignalStrength.

Change-Id: Ie2acec9e01af0e64a61902383f06729a7cee1975
2013-06-21 09:58:11 -07:00
Dianne Hackborn
11cd57caee Merge "Avoid unnecessary FindClass("java/lang/String")." 2013-06-18 01:14:37 +00:00
Elliott Hughes
f6a671394c Merge "Correct Date format for el_GR, sv_SE and tr_TR locales" 2013-06-17 20:36:53 +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
Vladimir Marko
aa5fe3d206 Avoid unnecessary FindClass("java/lang/String").
Use previously retrieved global reference instead.
Check for NULL after creating the global reference.

Change-Id: I21670d2ef0f63ddb5801dd21e7e56359e5519479
2013-06-17 17:54:58 +01:00
Elliott Hughes
618ed23402 Merge "Track nio API change." 2013-06-14 23:18:35 +00:00
Elliott Hughes
28b7245cc1 Track nio API change.
Change-Id: I6a6d6c9e5f658b66dca0db226d2d91ee5f8ab2c7
2013-06-14 15:41:26 -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
8152c7940a Merge "Fix incorrect fragment animation used for hiding fragments" 2013-06-07 18:46:18 +00: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
70b74646b8 Merge "Track libcore changes." 2013-06-06 20:51:30 +00:00
Elliott Hughes
598a16f71e Track libcore changes.
Bug: 3484927
Change-Id: I3a3c4a9f0ad6055261f705987bc576cd28bebb46
2013-06-06 13:40:21 -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
Wink Saville
39136d391a Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 2013-06-01 14:09:53 +00:00
Amith Yamasani
9b76b2d29f Merge "framework:base: iterator error in singletone provider" 2013-05-29 22:04:01 +00:00
Jun Su
cca0965a1b framework:base: iterator error in singletone provider
In case of singletone provider, we don't count it in the guset user.
After we remove it from the array, and resize the array, need to move
iterator back.

Change-Id: I99920a6beccc9de0e67ffeb632b1940efaee10b9
2013-05-29 14:33:59 +08:00
Andrew Hsieh
09377ddb93 Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 2013-05-29 00:06:54 +00:00
Jeff Sharkey
e4c29de9c6 Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 2013-05-28 20:44:47 +00:00
Jeff Brown
3422ceb6ba Merge "Bug fix for building the hover target list" 2013-05-28 20:04:23 +00:00
Jeff Brown
7573e5947a Merge "Properly rotate full [-pi, +pi] orientation range if available" 2013-05-28 19:56:20 +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
Andrew Hsieh
c01e1ed688 Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
See b.android.com/55873

Change-Id: Idff7b71480991e16f57e55748fafa57d5827b10b
2013-05-27 12:27:10 +08:00
Dianne Hackborn
7f3ff133c1 Merge "Fix wrong log information in DevicePolicyManagerService" 2013-05-26 07:22:21 +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
Dianne Hackborn
f325103356 Merge "Framework/base: Added synchronization block to avoid race condition" 2013-05-26 06:30:26 +00:00
Robert Greenwalt
1d8c5b5b1d Merge "Update tethering profile for specific operators" 2013-05-24 17:59:03 +00:00
seonju.oh
8645031246 Update tethering profile for specific operators
Update or add tethering profiles in config.xml.
And also add MOBILE_DUN to config_tether_upstream_types

FR-ORG,SFR
ES-VDF,ORG,Movistar
IT-VDF,TIM
GR-VDF
US-TMO
CA-Rogers,Fido
Isreal-ORG,PC HOT Mobile
HK-CSL,Hutchison
AU-Telstra

Change-Id: Ic3501263679785362bc50a5a4ea3751e7f0c7b21
Signed-off-by: Seonju Oh <seonju.oh@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
2013-05-24 10:33:11 -07:00
Geremy Condra
9c759e3968 Merge "Fix SELinux get.. methods aborting on invalid address" 2013-05-22 19:25:37 +00:00