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

104404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John Reck
28d91bdbde Merge "Revert "Can not mark the same content of browser page after copy"" 2013-04-30 01:21:31 +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
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
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
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
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
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
Nick Kralevich
ee4e9530e0 am 25619b2c: libdrm: fix bad strncpy / snprintf calls 
* commit '25619b2c6b3fd584affe20f34bfbf164a5ddbe7d':
  libdrm: fix bad strncpy / snprintf calls
 2013-04-29 11:18:59 -07:00
Nick Kralevich
25619b2c6b 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
Change-Id: If386922e907567f54e26897beffaa1cfe4777896
 2013-04-29 10:49:47 -07:00
Mårten Kongstad
08822df147 Document the 'aapt dump strings' command 
Update the usage page for aapt to mention 'strings' as a valid
subcommand to 'dump'.

Change-Id: Iadb2b8ce36951ff36ffbf6b5ea349ba1e2b12582
 2013-04-29 09:57:19 +02:00
Michael Wright
ccd11e309c am ef325d06: Merge "Add DPad keys to Playpad" into jb-mr2-dev 
* commit 'ef325d060800e5e1c955969889b549494be576ee':
  Add DPad keys to Playpad
 2013-04-26 17:16:07 -07:00
Michael Wright
ef325d0608 Merge "Add DPad keys to Playpad" into jb-mr2-dev 2013-04-26 23:57:39 +00:00
Ying Wang
9e69a2ced4 am 03ce5b53: Fix build. 
* commit '03ce5b536647853cbfa65357760f3fb246b85e36':
  Fix build.
 2013-04-26 15:56:15 -07:00
Ying Wang
03ce5b5366 Fix build. 
Change-Id: I1fedbbb521305e02502ddb23a96b5ee96fa43b7b
 2013-04-26 15:54:44 -07:00
Svetoslav
3a3f47e531 am eecf22d4: Merge "The helper query bridge in AccessibilityServiceManager missing capability." into jb-mr2-dev 
* commit 'eecf22d464579e5b7a3baaa6c450481778b59a45':
  The helper query bridge in AccessibilityServiceManager missing capability.
 2013-04-26 15:23:36 -07:00
Kenny Root
f266c6b93f am f99177f3: Merge "Update preloaded classes" into jb-mr2-dev 
* commit 'f99177f3944e06fc7a1a516a0b703794e39af5f1':
  Update preloaded classes
 2013-04-26 15:23:34 -07:00
Svetoslav
eecf22d464 Merge "The helper query bridge in AccessibilityServiceManager missing capability." into jb-mr2-dev 2013-04-26 22:20:57 +00:00
Kenny Root
f99177f394 Merge "Update preloaded classes" into jb-mr2-dev 2013-04-26 22:20:35 +00:00
Irfan Sheriff
7167a66b5e Remove scan notification dialog on wifi off 
This is now only handled in settings app

Bug: 8732391
Change-Id: If232bfb9f6c3976059bde11280318901c35161e7
 2013-04-26 15:10:26 -07:00
Svetoslav
108fe59c12 The helper query bridge in AccessibilityServiceManager missing capability. 
1. The helper query bridge service did not have the now capability
   to query the screen content.

2. Fixing the build.

bug:8633951

Change-Id: Ief6a3387793710a83b83c18cc6c53b51dcda9bdf
 2013-04-26 15:08:19 -07:00
Michael Wright
275d6915e5 Add DPad keys to Playpad 
Change-Id: If274aa7e9d5e4988cf613ea9a16584c413ded8dd
 2013-04-26 15:06:38 -07:00
Zhentao Sun
f8f085c51b Fixed race conditions in GeofenceHardwareImpl. 
Fixed b/8725226
1. Check if a geofence is registered before calling removeGeofence,
pauseGeofence and resumeGeofence
2. Moved add/remove operation of mGeofences from handler thread to
binder thread to fix potential race conditions by REMOVE_GEOFENCE.

Change-Id: I1c68a49ac4a08324c13702ba9013d2adf031aed9
 2013-04-26 14:41:53 -07:00
Svetoslav
d66496bcaa am fdbd23c6: Merge "Deliver key events to the system if no accessibility service handles them." into jb-mr2-dev 
* commit 'fdbd23c64f03ee39759208252a965fec81ad860a':
  Deliver key events to the system if no accessibility service handles them.
 2013-04-26 14:40:28 -07:00
Svetoslav
fdbd23c64f Merge "Deliver key events to the system if no accessibility service handles them." into jb-mr2-dev 2013-04-26 21:37:05 +00:00
Svetoslav
ca523d6e95 Deliver key events to the system if no accessibility service handles them. 
We have APIs that allow an accessibility service to filter key events. The
service has to declare the capability to toggle event filtering in its
manifest and then it can set a flag to toggle the feature at runtime. The
problem was that even if no accessibility service was handling key events
these events were not fed back to the input system.

This change adds a new feature flag in the accessibility input filter that
is set only if at least one service can and wants to filter key events. If
the feature flag is set then the filter will deliver events to services and
,if they are not handled, to the system. This change also cleaned the logic
for updating the input filter.

bug:8713422

Change-Id: I4bc0c1348676569d1b76e9024708d1ed43ceb26a
 2013-04-26 13:58:09 -07:00
Kenny Root
9787b80ea8 Update preloaded classes 
Bug: 5213043
Change-Id: I272500ce7f6ea6bfbc624c9705f8c8b8ef1aa0ad
 2013-04-26 13:38:07 -07:00
gcondra@google.com
bb393d68e4 am 0b063188: Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev 
* commit '0b063188054e8d1843f19325063349529494e29d':
  Set persistent property for SELinux enforcement on update.
 2013-04-26 13:37:51 -07:00
repo sync
0b06318805 Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev 2013-04-26 20:31:37 +00:00
Matthew Xie
1dd01eb36b Donot start Bluetooth Manager Service when bluetooth hardware feature is missing 
bug 8374762

Change-Id: Iea06bd05e19eeddf3398ac446f3d6b80fce51283
 2013-04-26 12:41:45 -07:00
Elliott Hughes
032d8e3890 am 0bb497b8: Merge "Use the newer ZoneInfoDB API." 
* commit '0bb497b8d1bac2206df89a878ecb7e356d21fe99':
  Use the newer ZoneInfoDB API.
 2013-04-26 12:38:04 -07:00