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
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