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

105617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
47aa51d029 am 70b74646: Merge "Track libcore changes." 
* commit '70b74646b8114b7ee9e35ce4283ecab8c8528dcc':
  Track libcore changes.
 2013-06-06 13:53:54 -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
4d33a8aba3 am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format" 
* commit 'fa6d6256e9052a5f5155ac97364170f6518e37a4':
  change "next" to "done" in minute IME option under 24-hour format
 2013-06-05 16:23:34 -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
The Android Open Source Project
b18841b442 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ib4adc6b9ad37713ec04b6cacce5279e12395e3a6
 2013-06-03 16:43:47 -07:00
Robert Greenwalt
b0a88e5716 Apply scan-always setting to initial wifi state. 
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.

bug:9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
 2013-06-03 15:03:36 -07:00
Joe Malin
8811154e93 am 423f8a8c: am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '423f8a8c21ec4e702e72ffce27bb3b5481170bae':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:31:21 -07:00
Joe Malin
423f8a8c21 am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '2618ac55a94a97e29abd9defa93dea30e067b4e4':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:27:50 -07:00
Joe Malin
2618ac55a9 am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit 'a37bda7b616452d0072b012cc7ae8fcae51e943f':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:23:08 -07:00
Joe Malin
a37bda7b61 am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '468d82bb7150996c8b2b4228d0e8d031f74e304b':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:20:45 -07:00
Joe Malin
468d82bb71 am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '6bf45dc773de186b68af3cc9fdc275acbd3d86aa':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:18:22 -07:00
Joe Malin
6bf45dc773 am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit 'b6a35268ccb698cde6d2e1e2f475a7299112b034':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:17:15 -07:00
Baligh Uddin
ba82b53dd7 am 26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '26fe0761e3e275347c06f9224e24ab7a31ff23e8':
  Import translations. DO NOT MERGE
 2013-06-03 14:15:52 -07:00
Baligh Uddin
26fe0761e3 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-03 21:14:23 +00:00
The Android Open Source Project
5871434ed6 Reconcile with jb-mr2-release - do not merge 
Change-Id: I29c033be91cbfe80951c043ac96208d894fbda60
 2013-06-03 14:02:50 -07:00
Joe Malin
b6a35268cc B9257437: Typo in javadoc for AccountManager 
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
 2013-06-03 12:20:08 -07:00
Scott Main
dce21a59d9 am 3c080baa: am 564889b1: am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '3c080baad5609faa663238f202c7aae7268bbd2c':
  update dashbord for 6/3
 2013-06-03 11:35:02 -07:00
Scott Main
3c080baad5 am 564889b1: am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '564889b1263bb1c5cfcd21401f853b0cc1569a50':
  update dashbord for 6/3
 2013-06-03 11:33:13 -07:00
Scott Main
564889b126 am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '4a024be4de71f90eaaff7be8122926bdc9297d38':
  update dashbord for 6/3
 2013-06-03 11:17:15 -07:00
Scott Main
4a024be4de am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '4cef8150c83ce60a4d3acc495132357fb9bd1458':
  update dashbord for 6/3
 2013-06-03 11:15:16 -07:00
Scott Main
4cef8150c8 Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 2013-06-03 18:12:54 +00:00