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

104379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jeff Brown
eb6403e95d resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp 
Change-Id: I42e15a186561222edd0d97047fcd207208a87282
 2013-04-26 12:04:07 -07:00
Elliott Hughes
0bb497b8d1 Merge "Use the newer ZoneInfoDB API." 2013-04-26 18:41:47 +00:00
Jeff Brown
bfdd256632 Merge "Generate SDK docs for v7 support library packages." into jb-mr2-dev 2013-04-26 18:31:12 +00:00
Elliott Hughes
48289433d8 Use the newer ZoneInfoDB API. 
Change-Id: I846c720ae6c262afb4fd7f8a749008c837e76cc4
 2013-04-26 11:30:54 -07:00
Wink Saville
962b038d01 am cdeb9cc1: Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev 
* commit 'cdeb9cc1decaf23e5ec515b8841d33ecaedb57fd':
  Enhance TelephonyManger javadocs.
 2013-04-26 11:23:02 -07:00
Wink Saville
cdeb9cc1de Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev 2013-04-26 18:20:41 +00:00
Baligh Uddin
3433b6ff34 am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '5391a2fcb0d1232723ad37d6872bb5800414052f':
  Import translations. DO NOT MERGE
 2013-04-26 10:37:22 -07:00
Baligh Uddin
5391a2fcb0 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-26 17:32:25 +00:00
Victoria Lease
aae1b5163c am b0e0e54d: Merge "Can not mark the same content of browser page after copy" 
* commit 'b0e0e54d9dbef720ac653ed87d8ed6b46e1abdbe':
  Can not mark the same content of browser page after copy
 2013-04-26 10:27:02 -07:00
Victoria Lease
b0e0e54d9d Merge "Can not mark the same content of browser page after copy" 2013-04-26 17:17:39 +00:00
Irfan Sheriff
bafd663fcd am 4d9431ab: Merge "Fix network reload when config is restored" into jb-mr2-dev 
* commit '4d9431ab35c0a8bff8d1e05aa0148aea5ccdbc2f':
  Fix network reload when config is restored
 2013-04-26 09:56:56 -07:00
Irfan Sheriff
4d9431ab35 Merge "Fix network reload when config is restored" into jb-mr2-dev 2013-04-26 16:52:51 +00:00
Svetoslav Ganov
d385999462 am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev 
* commit '951ce6c966311d36328a89784d4c2e6836e9ae87':
  Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.
 2013-04-26 09:38:18 -07:00
Svetoslav Ganov
951ce6c966 Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev 2013-04-26 16:35:49 +00:00
Baligh Uddin
de40bb4570 Import translations. DO NOT MERGE 
Change-Id: I59b1ac894eb47376cc516df18dea34bcc546060d
Auto-generated-cl: translation import
 2013-04-26 08:53:21 -07:00
Jeff Brown
caf7b0a155 Generate SDK docs for v7 support library packages. 
This change required fixing some bugs in how AAPT handles
qualified symbols such as "android:layout_height"
when generating JavaDoc links.  The links were being
generated using the package name of the generated R file
rather than the package name of the referenced symbol.
These broken links caused the JavaDoc build to fail.

Bug: 8175766
Change-Id: I52fbef27825a25abca960cb44b59c2132267e9d6
 2013-04-26 00:20:42 -07:00
Irfan Sheriff
cca308e3e8 Fix network reload when config is restored 
With scan mode opted in, supplicant connection is not shut
down even when wifi is turned off. This is a problem since
networks need to be reloaded when wifi is turned off and turned on
and this currently happens only on a supplicant connection.

Fix to handle this for scan mode state.

Bug: 8714796
Change-Id: I7d66c39fb51018fb52e783341222cea993993893
 2013-04-25 23:27:19 -07:00
Scott Main
01e48e7d15 am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev 
* commit '22f6a60e62253436a4f7da1a5d59adc0f17534cc':
  add docs for new attributes, including account restriction for restricted profiles
 2013-04-25 21:22:38 -07:00
Chris Craik
57fc8122ea am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev 
* commit 'addc906f70ba24aa4b649fff7f98d88b96c8d808':
  Force clipping on layers that fail to be allocated
 2013-04-25 21:22:35 -07:00
Scott Main
22e9225ab1 am 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev 
* commit '5e5aeb46849e21b605ef59a691bca478eb4fa380':
  fix javadoc build also add some docs to the service
 2013-04-25 21:22:33 -07:00
Amith Yamasani
83a6142173 am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev 
* commit 'bbd90f8e7051fde96092cacdebc5d94ce46c7140':
  Hide isLinkedUser()
 2013-04-25 21:22:31 -07:00
Matthew Xie
7a21c4cdb1 am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev 
* commit '7f3c5d164fd34e77b783e8c09b65645a1b143f6a':
  Added flush() for bluetooth output stream
 2013-04-25 21:22:29 -07:00
Kristian Monsen
501bf50355 am 58665709: Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev 
* commit '5866570947a7ef325f74d9dbfc1ccbdd02d3e7b6':
  Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B
 2013-04-25 21:22:26 -07:00
Scott Main
22f6a60e62 Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev 2013-04-26 03:26:12 +00:00
Chris Craik
addc906f70 Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev 2013-04-26 02:15:45 +00:00