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

106098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
f0e8c78a11 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-30 14:54:27 +00:00
Chet Haase
6b313da0d8 Merge "Clarify behavior of fullscreen mode and softInputMode's adjustResize" into jb-mr2-dev 2013-04-30 14:45:46 +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
Baligh Uddin
74b736fd1c Import translations. DO NOT MERGE 
Change-Id: Ic7fe032626cac3828e5b1eeaf9f4b4513a46b77a
Auto-generated-cl: translation import
 2013-04-29 22:25:03 -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
Alan Viverette
561dcc5823 Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev 2013-04-30 01:11:08 +00:00
Craig Mautner
9db9a0bde5 Move task methods into TaskRecord. 
Stop doing backflips to do task operations in ActivityStack.

Change-Id: I57b1be6affcb8b7d504ae33b3e44bde2e6253f1c
 2013-04-29 17:05:56 -07: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
Craig Mautner
0e415c6662 A better fix for bug 8740202. 
Continue to layout windows that are animating away. Otherwise they
don't track with their parent windows that may be moving at the
same time.

Change-Id: Ic5b762ee538219fd6193e27dde6c245cbaa098df
 2013-04-29 16:18:29 -07:00
Chet Haase
45c89c2fad Clarify behavior of fullscreen mode and softInputMode's adjustResize 
Fullscreen window's will not resize when the keyboard comes on screen,
regardless of the setting of the window's softInputMode field. This fix
clarifies the docs to make this behavior more obvious.

Issue #8754615 Clarify behavior of adjustResize and fullscreen interaction

Change-Id: Ie056db4e328cefaf0edb54fe8cfa7a08f320c8d0
 2013-04-29 16:04:40 -07:00
Jesse Hall
d877efe3b1 Fix GLES30 JNI registration 
Bug: 8657863
Change-Id: I498f32480863b0716b2a8dfce467143087573cce
 2013-04-29 16:02:16 -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
Michael Wright
b3f6687756 Merge "input: added support for multiple keyevents" 2013-04-29 22:05:44 +00:00
Diego Torres Milano
2ac9d8d0f0 input: added support for multiple keyevents 
- Multiple keyevents can now be send from the command line:

    input keyevent <key code number or name> ...

  Sometimes invoking 'input' repeatedly does not send the events fast
  enough, this change solves the problem by allowing multiple key code
  number or names be added to the command line.

Change-Id: I0d0f34bddd99e0195c9badff2f8b3e2aa9a51737
 2013-04-29 22:05:24 +00:00
Alan Viverette
76f0c217fc Avoid crash when TextToSpeech calls onInit() from the constructor. 
If construction of a TextToSpeech object fails, it may call the
initialization listener's onInit() method before the assignment
of the constructed TextToSpeech object to a variable has occurred.

BUG: 8744558
Change-Id: I3404fdb39308009762371154b05d3653bab81ab2
 2013-04-29 14:59:04 -07:00
Christopher Tate
bd1730dec7 Merge "Document the 'aapt dump strings' command" 2013-04-29 21:34:28 +00:00
Kenny Root
d334cb13d6 am d152f7ec: Merge "Don\'t use X509CertImpl directly" 
* commit 'd152f7ec1ae43d77ff8e2206724ce71da3da9913':
  Don't use X509CertImpl directly
 2013-04-29 14:16:09 -07:00
Kenny Root
d152f7ec1a Merge "Don't use X509CertImpl directly" 2013-04-29 20:54:49 +00:00
Kenny Root
28b1f0ee02 Don't use X509CertImpl directly 
Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
 2013-04-29 13:27:39 -07:00
Matthew Xie
3424b817f6 am c5790636: Merge "Donot start Bluetooth Manager Service when bluetooth hardware feature is missing" into jb-mr2-dev 
* commit 'c579063615d93ba37df0bd71d96ec3bfafc586c4':
  Donot start Bluetooth Manager Service when bluetooth hardware feature is missing
 2013-04-29 12:38:19 -07:00
Matthew Xie
c579063615 Merge "Donot start Bluetooth Manager Service when bluetooth hardware feature is missing" into jb-mr2-dev 2013-04-29 19:35:28 +00:00
Zhentao Sun
460778f104 am 906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev 
* commit '906e57d8c03f887aab6a48001e9d0bdff9864365':
  Fixed race conditions in GeofenceHardwareImpl.
 2013-04-29 11:51:58 -07:00
Zhentao Sun
906e57d8c0 Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev 2013-04-29 18:50:18 +00:00
Jeff Sharkey
b98212925e Merge "Decorate AssetFileDescriptor with Closeable." 2013-04-29 18:24:45 +00:00
Eino-Ville Talvala
cc87e73a55 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2013-04-29 11:22:54 -07:00