Andy McFadden
c305745f19
Merge "Regenerate GL stubs"
2013-04-29 18:22:37 +00:00
Michael Wright
0436998b5d
am ccd11e30: am ef325d06: Merge "Add DPad keys to Playpad" into jb-mr2-dev
...
* commit 'ccd11e309c00ba385c84114dea88f28017148797':
Add DPad keys to Playpad
2013-04-29 11:22:30 -07:00
Jeff Sharkey
32559e191f
Decorate AssetFileDescriptor with Closeable.
...
Change-Id: I1f5f462b781a6e8fad77337006febd9c54694c0b
2013-04-29 11:22:20 -07:00
Ying Wang
2120f87cde
am 9e69a2ce: am 03ce5b53: Fix build.
...
* commit '9e69a2ced4e11f74ee979390c3f58ec4318a16c3':
Fix build.
2013-04-29 11:22:15 -07:00
Svetoslav
9d2fcfbf3d
am 3a3f47e5: am eecf22d4: Merge "The helper query bridge in AccessibilityServiceManager missing capability." into jb-mr2-dev
...
* commit '3a3f47e53188f15a68d22392958ede741d71fa0f':
The helper query bridge in AccessibilityServiceManager missing capability.
2013-04-29 11:22:09 -07:00
Kenny Root
b566ebdc92
am f266c6b9: am f99177f3: Merge "Update preloaded classes" into jb-mr2-dev
...
* commit 'f266c6b93f44fcc674d4c5686af0c1d1b782dab0':
Update preloaded classes
2013-04-29 11:22:06 -07: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
Craig Mautner
34761434a0
Merge "Exclude regions from the tap detector."
2013-04-29 17:31:48 +00:00
Craig Mautner
6601b7bdeb
Exclude regions from the tap detector.
...
Fix typing on the keyboard causing focus to shift stacks.
Change-Id: I4ec9ccdbe35e27f4860a5bdf0e2818f58e53b873
2013-04-29 10:29:11 -07:00
John Spurlock
8929bae781
Merge "Hideybar gesture clears flags if SYSTEM_UI_FLAG_FULLSCREEN"
2013-04-29 12:52:26 +00:00
Bjorn Bringert
7bb9471ea7
Merge "Allow compiling aapt for the device"
2013-04-29 10:10:52 +00: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
Craig Mautner
eda67299cf
Generic refactoring for clarity.
...
- Log.* was being interspersed with Slog.*.
- WindowState Rects were being converted to local variables making
it harder to find all references to them.
Change-Id: I868a32028604d46dbbc15b005a440f0571336293
2013-04-28 13:50:14 -07:00
Craig Mautner
ccb825dde6
Merge "Clean up FocusedStackFrame layer setting."
2013-04-28 16:02:47 +00:00
Craig Mautner
f76664673e
Clean up FocusedStackFrame layer setting.
...
- Putting the stack frame above the highest app window layer ends up
putting it over the IME when the caret popup is showing. This puts
the stack frame layer above the highest non-child window layer.
- Also change the timing so the layer isn't applied until all other
layers are also being applied.
Change-Id: Ic5f142998822ac1e3890a2943cda7fc86a7e7974
2013-04-28 08:58:21 -07:00
Svetoslav
3dc75ac65f
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 18:05:36 -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
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
Jeff Sharkey
5a996b30f7
Merge "Disable various sampling event logs."
2013-04-26 21:56:26 +00:00
Jim Miller
3853e0c3ff
Merge "Add keyguard background scrim and protection around keyguard APIs"
2013-04-26 21:43:56 +00:00
Svetoslav
fd782549be
am d66496bc: am fdbd23c6: Merge "Deliver key events to the system if no accessibility service handles them." into jb-mr2-dev
...
* commit 'd66496bcaacd454e3c3a2d47910653989d48fcda':
Deliver key events to the system if no accessibility service handles them.
2013-04-26 14:42:19 -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
Jim Miller
c0b676dcc2
Add keyguard background scrim and protection around keyguard APIs
...
With this change, the system process will put up a scrim in the
event keyguard crashes to protect underlying content.
It also adds permission checks to prevent unathorized access
through the binder APIs.
Cleaned up KeyguardTestActivity to build separately.
Removed unused resources.
Change-Id: I9e370c6bfb7dca68eae9eae304c815fb84a753d2
2013-04-26 14:34:21 -07: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
gcondra@google.com
69fd7bd660
am bb393d68: am 0b063188: Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev
...
* commit 'bb393d68e4dbb5334c3b3984ef2020e0cfc7e790':
Set persistent property for SELinux enforcement on update.
2013-04-26 13:39:39 -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
Andreas Huber
ac74c517fc
Merge "Fix wfd crash after disconnect due to null pointer exception in"
2013-04-26 20:04:07 +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
305615e5b8
am 032d8e38: am 0bb497b8: Merge "Use the newer ZoneInfoDB API."
...
* commit '032d8e3890335e96b16bfa3fbd7706fbb0f2d2c0':
Use the newer ZoneInfoDB API.
2013-04-26 12:39:34 -07:00
Mike J. Chen
67a1218477
Fix a crash case
...
There's a runtime check for a bad argument, but it is
after the usage of the bad argument. Move the usage
after the check.
Bug 8687716
Change-Id: Iddfa457951bac69b436a430cda21b5d7a563107b
Signed-off-by: Mike J. Chen <mjchen@google.com>
2013-04-26 12:39:04 -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
5ae02e92e4
am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp
...
* commit 'eb6403e95d601b62be7b4610599e72fd329f2666':
Generate SDK docs for v7 support library packages.
2013-04-26 12:06:15 -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
Andreas Huber
b551c6d959
Fix wfd crash after disconnect due to null pointer exception in
...
WindowManagerService.java
Change-Id: I661f9c73d481da88661793ad529c0807cf74a5e7
2013-04-26 11:54:53 -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