drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,641 Commits 1 Branch 0 Tags
Commit Graph

105641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
e88fe7f415 am 94fed1c5: Merge "Track libcore API update." 
* commit '94fed1c5d570a92d357657451e5b47aba4feee12':
  Track libcore API update.
 2013-07-01 16:45:33 -07:00
Elliott Hughes
94fed1c5d5 Merge "Track libcore API update." 2013-07-01 23:40:18 +00:00
Elliott Hughes
bf1589d0df Track libcore API update. 
Bug: 3484927
Change-Id: I04de17b1191295e3fa874c9e351ae686d9eecef5
 2013-07-01 16:39:34 -07:00
Elliott Hughes
7c56325d57 am c26e5505: Merge "Track libcore API update." 
* commit 'c26e5505495f7a36163477e12098d5fd2822cae9':
  Track libcore API update.
 2013-07-01 16:22:16 -07:00
Elliott Hughes
c26e550549 Merge "Track libcore API update." 2013-07-01 23:20:09 +00:00
Wink Saville
f313da5bfe am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA" 
* commit 'aff0ac4d202934dde7765f7418ea2ad38b0c2faa':
  Do not set the network mode differently for LTE+CDMA
 2013-07-01 16:00:23 -07:00
Wink Saville
aff0ac4d20 Merge "Do not set the network mode differently for LTE+CDMA" 2013-07-01 22:56:08 +00:00
Elliott Hughes
812990a9e5 Track libcore API update. 
Bug: 3484927
Change-Id: I52a37bdeafe431255034543e0fad5f808955309f
 2013-07-01 14:46:31 -07:00
Naveen Kalla
97ecc9ec24 Do not set the network mode differently for LTE+CDMA 
ro.telephony.default_network can be set if needed to set a different
value for LTE+CDMA. No need to hardcode preferred network mode in the source code.

Change-Id: Iae65f72a6a3bc31d500c5ecec87368a6f2a5d117
 2013-07-01 11:16:38 -07:00
Elliott Hughes
c63c068228 am e3b94f05: Merge "Track libcore API change." 
* commit 'e3b94f05b8be2b6305cbee77c23b7f7599bfcff7':
  Track libcore API change.
 2013-06-28 18:11:10 -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
a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master 
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
 2013-06-28 16:41:19 -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
324993abed am 5216f11e: Merge "Track libcore API update." 
* commit '5216f11e462b9f17704c0ac9e193d2149f3fa755':
  Track libcore API update.
 2013-06-28 16:23:47 -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
ce566b5068 am ee66531f: Merge "Track libcore API update." 
* commit 'ee66531f2fa2b6aaa5ca064062f5e8d50b64ff44':
  Track libcore API update.
 2013-06-28 15:58:45 -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
a9510297a6 am 505974eb: Merge "Track libcore API update." 
* commit '505974eb736218d40b1d648ea4af548167a381b1':
  Track libcore API update.
 2013-06-28 13:07:21 -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
6c042b6d67 am a5a2de55: Merge "Add ALPN support to SSL socket factory" 
* commit 'a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf':
  Add ALPN support to SSL socket factory
 2013-06-27 14:52:17 -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
9d2b0dbf67 am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread" 
* commit '12c4c0e45b12be18005f0ad2af2433e34dcb1a9f':
  Fix deadlock of WebViewCoreThread
 2013-06-25 15:31:39 -07:00
John Reck
12c4c0e45b Merge "Fix deadlock of WebViewCoreThread" 2013-06-25 22:28:02 +00:00
Christopher Tate
347182386c am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app" 
* commit '3e7d0344399ac2f607fddde32c1a5e54228a38f9':
  Avoid adding FORWARD_LOCK flag to an updated system app
 2013-06-24 16:05:49 -07: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
5b3afe3a84 am 4be48d43: (-s ours) Merge "Lockscreen : Reference correct layout" 
* commit '4be48d436bb2d8d2207b317f9a826c27671b6d4b':
  Lockscreen : Reference correct layout
 2013-06-24 14:27:28 -07: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
7334d25e79 am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght." 
* commit '34fb4eae36bc926886149718672809a1ad43be97':
  Fix misspelling of getLteSignalStrenght.
 2013-06-21 12:12:24 -07: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
1d4cd87904 am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")." 
* commit '11cd57caee4058dab743b91e715d7469c59a5c2f':
  Avoid unnecessary FindClass("java/lang/String").
 2013-06-17 18:21:41 -07:00
Dianne Hackborn
11cd57caee Merge "Avoid unnecessary FindClass("java/lang/String")." 2013-06-18 01:14:37 +00:00
Elliott Hughes
48fa06f34f am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales" 
* commit 'f6a671394ca3d269835d5f5b882b46f9539e9a96':
  Correct Date format for el_GR, sv_SE and tr_TR locales
 2013-06-17 13:38:59 -07: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
b87e6138d1 am 618ed234: Merge "Track nio API change." 
* commit '618ed2340283263164f578f818cc09148aacb9ed':
  Track nio API change.
 2013-06-14 16:22:12 -07: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
372d21ad69 am 6706ca96: Merge "Update HttpResponseCache to use the new cache API." 
* commit '6706ca96b21ebbd620fb597a23e8180f76bb37cf':
  Update HttpResponseCache to use the new cache API.
 2013-06-13 02:29:11 -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
d3cb6bcf0f am 8152c794: Merge "Fix incorrect fragment animation used for hiding fragments" 
* commit '8152c7940a10f11a9edb16ae1daeca8a6fe2e6bb':
  Fix incorrect fragment animation used for hiding fragments
 2013-06-07 11:49:32 -07:00