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

105807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
ba8d2e58f8 am c2639e58: am 0bb4c701: Merge "Use ICU for getDateFormatOrder." 
* commit 'c2639e58fa5724c06a1d910ad76aebed647b4ba2':
  Use ICU for getDateFormatOrder.
 2013-04-30 12:17:25 -07:00
Elliott Hughes
c2639e58fa am 0bb4c701: Merge "Use ICU for getDateFormatOrder." 
* commit '0bb4c701bab0f69172417b7a511acb6bdfa052db':
  Use ICU for getDateFormatOrder.
 2013-04-30 12:15:00 -07:00
Romain Guy
4225d79656 Merge "Handle Surface::lock errors in TextureView Bug #8689535" 2013-04-30 18:58:17 +00:00
Romain Guy
9e37d590a6 Merge "Fix TextClock documentation Bug #8670351" 2013-04-30 18:31:29 +00:00
Romain Guy
53bacf5a91 Handle Surface::lock errors in TextureView 
Bug #8689535

Change-Id: I6d16e13903a58e93940160e7656147656ab79982
 2013-04-30 11:30:10 -07:00
Elliott Hughes
0bb4c701ba Merge "Use ICU for getDateFormatOrder." 2013-04-30 18:22:18 +00:00
Romain Guy
09b1994c4d Fix TextClock documentation 
Bug #8670351

Change-Id: I87a906b85b51f44d9dcecb6f137db53886323ad7
 2013-04-30 11:19:39 -07:00
Elliott Hughes
edd6f9e688 Use ICU for getDateFormatOrder. 
Bug: 7207103
Change-Id: I680bb727cb74cd4b050f237f036d9e696201fc0b
 2013-04-30 11:09:53 -07:00
Romain Guy
f9aca99353 Merge "Prevent TextureView from ever setting a null layer paint" 2013-04-30 17:26:10 +00:00
Romain Guy
c2079c968d Prevent TextureView from ever setting a null layer paint 
Change-Id: If9a418b7eb9969410286df43ee805cd7d8ec17b2
 2013-04-30 10:25:35 -07:00
Kenny Root
178e8bbf25 am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp 
* commit 'e9ae6822a80cb1f3bd13c785f1727c03d35da52e':
  Track change to JSSE provider
 2013-04-30 09:01:38 -07:00
John Reck
6a5a04ae66 am be53f180: am 28d91bdb: Merge "Revert "Can not mark the same content of browser page after copy"" 
* commit 'be53f1806cf9f0ec69f785a0063227e0ed795eb8':
  Revert "Can not mark the same content of browser page after copy"
 2013-04-30 09:01:35 -07:00
Kenny Root
590bca3b24 resolved conflicts for merge of 09ab7ef9 to master 
Change-Id: I505317d0cde7a6daf0fd50b20cba21aa55693263
 2013-04-30 09:00:14 -07:00
Irfan Sheriff
3ddee7d6e9 am fd0b0072: am 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev 
* commit 'fd0b0072db6d89c85a5ea20383a1c3dc289d1d38':
  Remove scan notification dialog on wifi off
 2013-04-30 08:54:22 -07:00
Nick Kralevich
b7294d74dd am 5dc2ac4d: am 7318b840: am ec3396af: am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '5dc2ac4d7b5fdc7d3c1d9c60c47ad654ca55738d':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-30 08:54:18 -07:00
Christopher Tate
83725360f9 am 21675166: am bd1730de: Merge "Document the \'aapt dump strings\' command" 
* commit '21675166345646f5bb278af487e69604290f09b0':
 2013-04-30 08:54:13 -07:00
Kenny Root
10dd0d818e am d334cb13: am d152f7ec: Merge "Don\'t use X509CertImpl directly" 
* commit 'd334cb13d694a4f1c6b885070ec48033366a4b37':
 2013-04-30 08:54:02 -07:00
Kenny Root
f80d45bfc4 resolved conflicts for merge of 3424b817 to master 
Change-Id: Idb5bb208aa6aca66744fe6988029d22e739cc67b
 2013-04-30 08:45:12 -07:00
Zhentao Sun
752625c844 am 460778f1: am 906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev 
* commit '460778f10475bb9fa02cbfe8af7faef38807435c':
  Fixed race conditions in GeofenceHardwareImpl.
 2013-04-30 08:31:46 -07:00
Kenny Root
2074fcb4dd resolved conflicts for merge of ee4e9530 to master 
Change-Id: I33931a962aff0ee8f6a04972afb0147e46b57baf
 2013-04-30 08:29:25 -07:00
Baligh Uddin
592190d234 Merge "Import translations. DO NOT MERGE" 2013-04-30 14:56:13 +00:00
Kenny Root
e9ae6822a8 resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp 
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
 2013-04-29 23:09:03 -07:00
John Reck
be53f1806c am 28d91bdb: Merge "Revert "Can not mark the same content of browser page after copy"" 
* commit '28d91bdbde63ba1afe3bb67c5466527ec7184217':
  Revert "Can not mark the same content of browser page after copy"
 2013-04-29 22:53:57 -07:00
Michael Wright
09ab7ef9f7 resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp 
Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d
 2013-04-29 22:50:43 -07:00
Baligh Uddin
d976fe792e Import translations. DO NOT MERGE 
Change-Id: I1c5619a53271ddb3289ef2b6527274ef252e35e0
Auto-generated-cl: translation import
 2013-04-29 22:48:39 -07:00
Baligh Uddin
4431fbea94 Import translations. DO NOT MERGE 
Change-Id: I98754953f5b7d08dd0bac3510be1c5c082529b79
Auto-generated-cl: translation import
 2013-04-29 22:34:34 -07:00
Kenny Root
1f6e789b7e Merge "Track change to JSSE provider" 2013-04-30 04:02:01 +00:00
Mike Lockwood
16ac261b36 Merge "Fix javadoc errors for @deprecated tags with no explanatory comment" 2013-04-30 01:24:54 +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
Mike Lockwood
322780496f Fix javadoc errors for @deprecated tags with no explanatory comment 
Change-Id: I38a31facf7d4a9cd13645516f25b4305df65c618
 2013-04-29 18:21:25 -07:00
Jeff Sharkey
9e5045db93 Merge "Add longpress support to keyevent." 2013-04-30 01:18:30 +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
Mike Lockwood
17195e0378 Merge "Remove obsolete OMA-DRM support" 2013-04-30 00:00:00 +00:00
Mike Lockwood
853ad6fbe3 Remove obsolete OMA-DRM support 
Change-Id: Ic6008d4c9f8b9cd9fd4efec070260227af70559c
 2013-04-29 16:48:13 -07:00
Irfan Sheriff
fd0b0072db am 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev 
* commit '9f844790f305338de4fa3adda5e125c811f280ca':
  Remove scan notification dialog on wifi off
 2013-04-29 16:01:55 -07:00
Irfan Sheriff
9f844790f3 Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev 2013-04-29 22:58:50 +00:00
Nick Kralevich
5dc2ac4d7b am 7318b840: am ec3396af: am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '7318b84054144c2461fd9392870691b394b44b89':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:55:02 -07:00
Nick Kralevich
7318b84054 am ec3396af: am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'ec3396af9857bd50c6ccac692ecc12ab459239d2':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:53:04 -07:00
Nick Kralevich
ec3396af98 am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '0412d9c7c7e5977e1ffbb3a28bba9f37807876a7':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:50:14 -07:00
Nick Kralevich
0412d9c7c7 am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '4d17834ab3d4850352f3d33742945dad61722cd5':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:48:05 -07:00
Nick Kralevich
4d17834ab3 am b83e8b69: am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'b83e8b693b6738ba8e778d556ccdba629d372b52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:46:21 -07:00
Nick Kralevich
b83e8b693b am 292c979a: am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '292c979a0f1e503422924421557b146cd28fc0d2':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:44:43 -07:00
Nick Kralevich
292c979a0f am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'd440ca76029ab6f0909fdd9495941e04b90e5da7':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:42:54 -07:00
Nick Kralevich
d440ca7602 am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit 'f3a5323cc685fd78e7c4a7d7474b79cd34a4cf52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:41:36 -07:00
Nick Kralevich
f3a5323cc6 am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls 
* commit '6d8f5b755b133b308204b84145d773d401cdcd52':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 15:38:40 -07:00
Jeff Sharkey
11744d1536 Add longpress support to keyevent. 
Change-Id: I578cb7dd910425ce07fbe56412a4dc2e0c379e65
 2013-04-29 15:31:10 -07:00
Nick Kralevich
6d8f5b755b libdrm: fix bad strncpy / snprintf calls 
Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow

Bug: 8727221

(cherry picked from commit 25619b2c6b3fd584affe20f34bfbf164a5ddbe7d)

Change-Id: I9a99c9b8a63c8b9efb3b2b650c735467b77120f2
 2013-04-29 15:31:03 -07:00
Jeff Sharkey
f1301d86fb Merge commit 'b3f66877' into afdmerge 
Change-Id: I319863cf23b2e6eacfa4508f7b111fba7b1cbc24
 2013-04-29 15:29:13 -07:00
Christopher Tate
2167516634 am bd1730de: Merge "Document the \'aapt dump strings\' command" 
* commit 'bd1730dec7356e042ee885ff4a63b40f36733062':
  Document the 'aapt dump strings' command
 2013-04-29 15:19:24 -07:00
Kenny Root
12e752225a Track change to JSSE provider 
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
 2013-04-29 15:15:27 -07:00