OSDN Git Service
Romain Guy [Tue, 30 Apr 2013 20:21:19 +0000 (13:21 -0700)]
am
6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names."
* commit '
6628ee7a46a56cdc28d409e6fd74afc34bd24c5b':
HeaderViewListAdapter: Correct thrown error names.
Elliott Hughes [Tue, 30 Apr 2013 19:15:06 +0000 (12:15 -0700)]
am
afe56810: Merge "Fix DatePicker\'s spinner order in various locales."
* commit '
afe56810517a4ddfad125029ca04fd4cc5af2ef5':
Fix DatePicker's spinner order in various locales.
Elliott Hughes [Tue, 30 Apr 2013 19:15:00 +0000 (12:15 -0700)]
am
0bb4c701: Merge "Use ICU for getDateFormatOrder."
* commit '
0bb4c701bab0f69172417b7a511acb6bdfa052db':
Use ICU for getDateFormatOrder.
Romain Guy [Tue, 30 Apr 2013 19:11:22 +0000 (19:11 +0000)]
Merge "HeaderViewListAdapter: Correct thrown error names."
Taylor H. Perkins [Tue, 30 Apr 2013 19:04:52 +0000 (12:04 -0700)]
HeaderViewListAdapter: Correct thrown error names.
When accessing an invalid entry of the list, an IndexOutOfBounds exception is thrown, not an ArrayIndexOutOfBounds exception.
Change-Id: I3cf59faab004fa6391d84f30f280e0c9bd92dc44
Signed-off-by: Taylor H. Perkins <taylorhp@gmail.com>
Elliott Hughes [Tue, 30 Apr 2013 18:40:01 +0000 (18:40 +0000)]
Merge "Fix DatePicker's spinner order in various locales."
Elliott Hughes [Tue, 30 Apr 2013 18:22:18 +0000 (18:22 +0000)]
Merge "Use ICU for getDateFormatOrder."
Elliott Hughes [Tue, 30 Apr 2013 18:11:53 +0000 (11:11 -0700)]
Fix DatePicker's spinner order in various locales.
DatePicker always effectively uses yyyy MMM dd, so we need to ask
icu4c what order those should appear in for the user's locale. The
existing DateFormat code was an approximation that worked for en_US
but not for all languages (fa being one example).
Bug:
7207103
Change-Id: I7b12568dbc02522ebad6e1db5f8426109cd6f7ce
Elliott Hughes [Tue, 30 Apr 2013 18:09:53 +0000 (11:09 -0700)]
Use ICU for getDateFormatOrder.
Bug:
7207103
Change-Id: I680bb727cb74cd4b050f237f036d9e696201fc0b
Kenny Root [Tue, 30 Apr 2013 06:09:03 +0000 (23:09 -0700)]
resolved conflicts for merge of
1f6e789b to jb-mr2-dev-plus-aosp
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
John Reck [Tue, 30 Apr 2013 05:53:57 +0000 (22:53 -0700)]
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"
Michael Wright [Tue, 30 Apr 2013 05:50:43 +0000 (22:50 -0700)]
resolved conflicts for merge of
b3f66877 to jb-mr2-dev-plus-aosp
Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d
Kenny Root [Tue, 30 Apr 2013 04:02:01 +0000 (04:02 +0000)]
Merge "Track change to JSSE provider"
John Reck [Tue, 30 Apr 2013 01:21:30 +0000 (01:21 +0000)]
Merge "Revert "Can not mark the same content of browser page after copy""
John Reck [Tue, 30 Apr 2013 01:17:15 +0000 (01:17 +0000)]
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
Irfan Sheriff [Mon, 29 Apr 2013 23:01:55 +0000 (16:01 -0700)]
am
9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev
* commit '
9f844790f305338de4fa3adda5e125c811f280ca':
Remove scan notification dialog on wifi off
Irfan Sheriff [Mon, 29 Apr 2013 22:58:50 +0000 (22:58 +0000)]
Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev
Nick Kralevich [Mon, 29 Apr 2013 22:55:02 +0000 (15:55 -0700)]
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
Nick Kralevich [Mon, 29 Apr 2013 22:53:04 +0000 (15:53 -0700)]
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
Nick Kralevich [Mon, 29 Apr 2013 22:50:14 +0000 (15:50 -0700)]
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
Nick Kralevich [Mon, 29 Apr 2013 22:48:05 +0000 (15:48 -0700)]
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
Nick Kralevich [Mon, 29 Apr 2013 22:46:21 +0000 (15:46 -0700)]
am
b83e8b69: am
292c979a: am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
b83e8b693b6738ba8e778d556ccdba629d372b52':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:44:43 +0000 (15:44 -0700)]
am
292c979a: am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
292c979a0f1e503422924421557b146cd28fc0d2':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:42:54 +0000 (15:42 -0700)]
am
d440ca76: am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
d440ca76029ab6f0909fdd9495941e04b90e5da7':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:41:36 +0000 (15:41 -0700)]
am
f3a5323c: am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
f3a5323cc685fd78e7c4a7d7474b79cd34a4cf52':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 22:38:40 +0000 (15:38 -0700)]
am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
6d8f5b755b133b308204b84145d773d401cdcd52':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 17:49:47 +0000 (10:49 -0700)]
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
Christopher Tate [Mon, 29 Apr 2013 22:19:24 +0000 (15:19 -0700)]
am
bd1730de: Merge "Document the \'aapt dump strings\' command"
* commit '
bd1730dec7356e042ee885ff4a63b40f36733062':
Document the 'aapt dump strings' command
Kenny Root [Wed, 24 Apr 2013 05:34:24 +0000 (22:34 -0700)]
Track change to JSSE provider
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
Michael Wright [Mon, 29 Apr 2013 22:05:43 +0000 (22:05 +0000)]
Merge "input: added support for multiple keyevents"
Diego Torres Milano [Thu, 4 Apr 2013 17:44:34 +0000 (13:44 -0400)]
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
Christopher Tate [Mon, 29 Apr 2013 21:34:28 +0000 (21:34 +0000)]
Merge "Document the 'aapt dump strings' command"
Kenny Root [Mon, 29 Apr 2013 21:16:09 +0000 (14:16 -0700)]
am
d152f7ec: Merge "Don\'t use X509CertImpl directly"
* commit '
d152f7ec1ae43d77ff8e2206724ce71da3da9913':
Don't use X509CertImpl directly
Kenny Root [Mon, 29 Apr 2013 20:54:48 +0000 (20:54 +0000)]
Merge "Don't use X509CertImpl directly"
Kenny Root [Wed, 24 Apr 2013 05:33:18 +0000 (22:33 -0700)]
Don't use X509CertImpl directly
Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
Matthew Xie [Mon, 29 Apr 2013 19:38:19 +0000 (12:38 -0700)]
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
Matthew Xie [Mon, 29 Apr 2013 19:35:28 +0000 (19:35 +0000)]
Merge "Donot start Bluetooth Manager Service when bluetooth hardware feature is missing" into jb-mr2-dev
Zhentao Sun [Mon, 29 Apr 2013 18:51:58 +0000 (11:51 -0700)]
am
906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev
* commit '
906e57d8c03f887aab6a48001e9d0bdff9864365':
Fixed race conditions in GeofenceHardwareImpl.
Zhentao Sun [Mon, 29 Apr 2013 18:50:18 +0000 (18:50 +0000)]
Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev
Nick Kralevich [Mon, 29 Apr 2013 18:18:59 +0000 (11:18 -0700)]
am
25619b2c: libdrm: fix bad strncpy / snprintf calls
* commit '
25619b2c6b3fd584affe20f34bfbf164a5ddbe7d':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 17:49:47 +0000 (10:49 -0700)]
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
MÃ¥rten Kongstad [Thu, 20 Dec 2012 09:08:54 +0000 (10:08 +0100)]
Document the 'aapt dump strings' command
Update the usage page for aapt to mention 'strings' as a valid
subcommand to 'dump'.
Change-Id: Iadb2b8ce36951ff36ffbf6b5ea349ba1e2b12582
Michael Wright [Sat, 27 Apr 2013 00:16:07 +0000 (17:16 -0700)]
am
ef325d06: Merge "Add DPad keys to Playpad" into jb-mr2-dev
* commit '
ef325d060800e5e1c955969889b549494be576ee':
Add DPad keys to Playpad
Michael Wright [Fri, 26 Apr 2013 23:57:39 +0000 (23:57 +0000)]
Merge "Add DPad keys to Playpad" into jb-mr2-dev
Ying Wang [Fri, 26 Apr 2013 22:56:15 +0000 (15:56 -0700)]
Ying Wang [Fri, 26 Apr 2013 22:54:44 +0000 (15:54 -0700)]
Fix build.
Change-Id: I1fedbbb521305e02502ddb23a96b5ee96fa43b7b
Svetoslav [Fri, 26 Apr 2013 22:23:36 +0000 (15:23 -0700)]
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.
Kenny Root [Fri, 26 Apr 2013 22:23:34 +0000 (15:23 -0700)]
am
f99177f3: Merge "Update preloaded classes" into jb-mr2-dev
* commit '
f99177f3944e06fc7a1a516a0b703794e39af5f1':
Update preloaded classes
Svetoslav [Fri, 26 Apr 2013 22:20:57 +0000 (22:20 +0000)]
Merge "The helper query bridge in AccessibilityServiceManager missing capability." into jb-mr2-dev
Kenny Root [Fri, 26 Apr 2013 22:20:35 +0000 (22:20 +0000)]
Merge "Update preloaded classes" into jb-mr2-dev
Irfan Sheriff [Fri, 26 Apr 2013 22:10:26 +0000 (15:10 -0700)]
Remove scan notification dialog on wifi off
This is now only handled in settings app
Bug:
8732391
Change-Id: If232bfb9f6c3976059bde11280318901c35161e7
Svetoslav [Fri, 26 Apr 2013 22:08:16 +0000 (15:08 -0700)]
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
Michael Wright [Fri, 26 Apr 2013 22:06:38 +0000 (15:06 -0700)]
Add DPad keys to Playpad
Change-Id: If274aa7e9d5e4988cf613ea9a16584c413ded8dd
Zhentao Sun [Fri, 26 Apr 2013 21:41:53 +0000 (14:41 -0700)]
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
Svetoslav [Fri, 26 Apr 2013 21:40:28 +0000 (14:40 -0700)]
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.
Svetoslav [Fri, 26 Apr 2013 21:37:05 +0000 (21:37 +0000)]
Merge "Deliver key events to the system if no accessibility service handles them." into jb-mr2-dev
Svetoslav [Fri, 26 Apr 2013 20:11:11 +0000 (13:11 -0700)]
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
Kenny Root [Fri, 26 Apr 2013 19:53:57 +0000 (12:53 -0700)]
Update preloaded classes
Bug:
5213043
Change-Id: I272500ce7f6ea6bfbc624c9705f8c8b8ef1aa0ad
gcondra@google.com [Fri, 26 Apr 2013 20:37:51 +0000 (13:37 -0700)]
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.
repo sync [Fri, 26 Apr 2013 20:31:36 +0000 (20:31 +0000)]
Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev
Matthew Xie [Fri, 26 Apr 2013 19:37:54 +0000 (12:37 -0700)]
Donot start Bluetooth Manager Service when bluetooth hardware feature is missing
bug
8374762
Change-Id: Iea06bd05e19eeddf3398ac446f3d6b80fce51283
Elliott Hughes [Fri, 26 Apr 2013 19:38:04 +0000 (12:38 -0700)]
am
0bb497b8: Merge "Use the newer ZoneInfoDB API."
* commit '
0bb497b8d1bac2206df89a878ecb7e356d21fe99':
Use the newer ZoneInfoDB API.
Jeff Brown [Fri, 26 Apr 2013 19:02:36 +0000 (12:02 -0700)]
resolved conflicts for merge of
bfdd2566 to jb-mr2-dev-plus-aosp
Change-Id: I42e15a186561222edd0d97047fcd207208a87282
Elliott Hughes [Fri, 26 Apr 2013 18:41:47 +0000 (18:41 +0000)]
Merge "Use the newer ZoneInfoDB API."
Jeff Brown [Fri, 26 Apr 2013 18:31:12 +0000 (18:31 +0000)]
Merge "Generate SDK docs for v7 support library packages." into jb-mr2-dev
Elliott Hughes [Fri, 26 Apr 2013 18:30:54 +0000 (11:30 -0700)]
Use the newer ZoneInfoDB API.
Change-Id: I846c720ae6c262afb4fd7f8a749008c837e76cc4
Wink Saville [Fri, 26 Apr 2013 18:23:02 +0000 (11:23 -0700)]
am
cdeb9cc1: Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev
* commit '
cdeb9cc1decaf23e5ec515b8841d33ecaedb57fd':
Enhance TelephonyManger javadocs.
Wink Saville [Fri, 26 Apr 2013 18:20:41 +0000 (18:20 +0000)]
Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev
Baligh Uddin [Fri, 26 Apr 2013 17:37:22 +0000 (10:37 -0700)]
am
5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
5391a2fcb0d1232723ad37d6872bb5800414052f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Apr 2013 17:32:25 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Victoria Lease [Fri, 26 Apr 2013 17:27:02 +0000 (10:27 -0700)]
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
Victoria Lease [Fri, 26 Apr 2013 17:17:39 +0000 (17:17 +0000)]
Merge "Can not mark the same content of browser page after copy"
Irfan Sheriff [Fri, 26 Apr 2013 16:56:56 +0000 (09:56 -0700)]
am
4d9431ab: Merge "Fix network reload when config is restored" into jb-mr2-dev
* commit '
4d9431ab35c0a8bff8d1e05aa0148aea5ccdbc2f':
Fix network reload when config is restored
Irfan Sheriff [Fri, 26 Apr 2013 16:52:51 +0000 (16:52 +0000)]
Merge "Fix network reload when config is restored" into jb-mr2-dev
Svetoslav Ganov [Fri, 26 Apr 2013 16:38:18 +0000 (09:38 -0700)]
Svetoslav Ganov [Fri, 26 Apr 2013 16:35:49 +0000 (16:35 +0000)]
Baligh Uddin [Fri, 26 Apr 2013 15:53:21 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59b1ac894eb47376cc516df18dea34bcc546060d
Auto-generated-cl: translation import
Jeff Brown [Fri, 26 Apr 2013 04:24:44 +0000 (21:24 -0700)]
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
Irfan Sheriff [Fri, 26 Apr 2013 06:22:41 +0000 (23:22 -0700)]
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
Scott Main [Fri, 26 Apr 2013 04:22:38 +0000 (21:22 -0700)]
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
Chris Craik [Fri, 26 Apr 2013 04:22:35 +0000 (21:22 -0700)]
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
Scott Main [Fri, 26 Apr 2013 04:22:33 +0000 (21:22 -0700)]
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
Amith Yamasani [Fri, 26 Apr 2013 04:22:31 +0000 (21:22 -0700)]
am
bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev
* commit '
bbd90f8e7051fde96092cacdebc5d94ce46c7140':
Hide isLinkedUser()
Matthew Xie [Fri, 26 Apr 2013 04:22:29 +0000 (21:22 -0700)]
am
7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev
* commit '
7f3c5d164fd34e77b783e8c09b65645a1b143f6a':
Added flush() for bluetooth output stream
Kristian Monsen [Fri, 26 Apr 2013 04:22:26 +0000 (21:22 -0700)]
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
Scott Main [Fri, 26 Apr 2013 03:26:11 +0000 (03:26 +0000)]
Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev
Chris Craik [Fri, 26 Apr 2013 02:15:45 +0000 (02:15 +0000)]
Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev
Scott Main [Tue, 23 Apr 2013 20:30:06 +0000 (13:30 -0700)]
add docs for new attributes, including account restriction for restricted profiles
Change-Id: I737ea55bfa58562b1b384e52626e95b479759376
Scott Main [Fri, 26 Apr 2013 01:57:00 +0000 (01:57 +0000)]
Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev
Amith Yamasani [Fri, 26 Apr 2013 01:42:20 +0000 (01:42 +0000)]
Merge "Hide isLinkedUser()" into jb-mr2-dev
Matthew Xie [Fri, 26 Apr 2013 01:18:33 +0000 (01:18 +0000)]
Merge "Added flush() for bluetooth output stream" into jb-mr2-dev
Alan Viverette [Fri, 26 Apr 2013 00:32:45 +0000 (17:32 -0700)]
Revert change
f449c0c381239dc0f78b0f01ecfb3889e056a597.
Previously, onHoverEvent() would return true if a view was hoverable
and consume the event. After the change, it would return the result of
dispatchGenericMotionEventInternal(). As a result, touch exploration
caused multiple hover events to be sent from every view under a given
touch point. This change reverts to the original behavior and fixes
touch exploration.
BUG:
8723842
Change-Id: I0c7362f19c51bf21ed842711a03b7f02613958d2
Kristian Monsen [Fri, 26 Apr 2013 00:06:16 +0000 (00:06 +0000)]
Merge "Workaround for bug
8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev
Scott Main [Thu, 25 Apr 2013 23:57:16 +0000 (16:57 -0700)]
fix javadoc build
also add some docs to the service
Change-Id: I712710de403bc000c0a69a2de726bace6e7873bd
Nick Kralevich [Thu, 25 Apr 2013 23:57:59 +0000 (16:57 -0700)]
am
e00a3b80: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev
* commit '
e00a3b80635c830dc57510556231cc40db6651f5':
Don't set ADDR_COMPAT_LAYOUT on the emulator
Svetoslav [Thu, 25 Apr 2013 23:57:56 +0000 (16:57 -0700)]
am
c38bc5ab: Merge "Lockscreen widgets not always announced." into jb-mr2-dev
* commit '
c38bc5ab6b55804c7a8d440cf2bf249baa2efc98':
Lockscreen widgets not always announced.
Jeff Sharkey [Thu, 25 Apr 2013 23:57:54 +0000 (16:57 -0700)]
am
99ba7203: Merge "Avoid leaking Surface native object." into jb-mr2-dev
* commit '
99ba72039d9d97ea3ed7d01b327b98c87051e989':
Avoid leaking Surface native object.
Michael Wright [Thu, 25 Apr 2013 23:57:52 +0000 (16:57 -0700)]
am
b044c40c: Merge "Fixed javadoc in input related classes" into jb-mr2-dev
* commit '
b044c40c154ba8abe62154608812ad87993ca0d8':
Fixed javadoc in input related classes
Igor Murashkin [Thu, 25 Apr 2013 23:57:49 +0000 (16:57 -0700)]
am
eaebe4c1: Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev
* commit '
eaebe4c1062e3196f6dbff1c33ef7ec3c21c1900':
Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED
Daniel Sandler [Thu, 25 Apr 2013 23:57:47 +0000 (16:57 -0700)]
am
cc165d16: Merge "Fix build." into jb-mr2-dev
* commit '
cc165d165e314ccef5d14891fb7673d3baefd7bb':
Fix build.