Brad Fitzpatrick
59c4f35280
Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread
2010-10-19 12:40:53 -07:00
Joe Onorato
b99cc1dcf3
Merge "Reduce logging." into gingerbread
2010-10-19 12:23:51 -07:00
Brad Fitzpatrick
8e8732bfa9
Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
2010-10-19 12:12:31 -07:00
Joe Onorato
fc1a4df523
Reduce logging.
...
Remember, the system and main logs are
- Shared resources
- Primarily for recording problems
- To be used only for large grained events during normal operation
Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
2010-10-19 15:08:05 -04:00
Andreas Huber
7961f288be
Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
2010-10-19 09:59:01 -07:00
Kenny Root
bfa020c524
Merge "Don't symlink native library paths for old apps" into gingerbread
2010-10-19 09:28:28 -07:00
Wu-cheng Li
40d4893769
Merge "Fix some camera orientation javadoc errors." into gingerbread
2010-10-19 07:54:17 -07:00
Brad Fitzpatrick
5522e5f34c
Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread
2010-10-18 16:46:03 -07:00
Shimeng (Simon) Wang
95ea513755
Merge "Don't force ended when full screen video is returned manually." into gingerbread
2010-10-18 16:40:25 -07:00
Nick Pelly
77371310a6
Merge "NFC: broadcast intent constants for adapter state change" into gingerbread
2010-10-18 15:18:59 -07:00
Nick Pelly
bbb2083f33
Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread
2010-10-18 15:17:23 -07:00
Mike Lockwood
5232a101ad
Merge "GPS: Enable some more logging" into gingerbread
2010-10-18 15:14:46 -07:00
Jeff Brown
d88671ab8c
Merge "Fix bug where home presses were not poking user activity." into gingerbread
2010-10-18 15:13:33 -07:00
Jeff Brown
ef3a823482
Fix bug where home presses were not poking user activity.
...
We now poke user activity twice: once upon dequeueing an event
for dispatch and then again just before we dispatch it. The second
poke is to compensate for the fact that it can take a few seconds to
identify the dispatch target (if the application is responding slowly)
but we want to keep the display from going to sleep for X amount of time
after the app gets a chance to actually receive the event. This mirrors
pre-Gingerbread behavior.
Removed some unnecessary code that filters user activity pokes when sending
events to KeyGuard. We don't need this because KeyGuard already tells the
power manager to disable user activity.
Bug: 3101397
Change-Id: I8c3a77601fdef8f584e84cfdd11aa79da0ff51db
2010-10-18 14:50:13 -07:00
Adam Powell
92866ad00b
Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread
2010-10-18 14:19:52 -07:00
Mike Lockwood
b9d9de2bdf
Merge "Enable framework GPS and location manager logging" into gingerbread
2010-10-18 14:16:15 -07:00
Eric Rowe
661ef589b8
Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread
2010-10-18 13:53:48 -07:00
John Huang
2d512f5736
Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread
2010-10-18 13:41:04 -07:00
John Huang
c346fa137b
Merge "Set the thread pool size of NIST sip stack to one." into gingerbread
2010-10-18 13:39:33 -07:00
Joe Onorato
3e640596eb
Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread
2010-10-18 13:14:16 -07:00
Nick Pelly
8a1c39374c
Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread
2010-10-18 12:00:48 -07:00
Andreas Huber
0918dd2f05
Merge "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread
2010-10-18 11:46:44 -07:00
Ying Wang
f52c24a3b0
Merge "Link against the static libcrypto in external/openssl." into gingerbread
2010-10-18 11:44:28 -07:00
Andreas Huber
f0ab0edc19
Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread
2010-10-18 11:18:11 -07:00
Gilles Debunne
edeaa96c99
Merge "Removed "Select word" option on password fields." into gingerbread
2010-10-18 10:16:13 -07:00
Ben Murdoch
319b628127
Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread
2010-10-18 10:15:55 -07:00
Eric Laurent
ecbb38c225
Merge "Fix issue 3098880." into gingerbread
2010-10-15 17:18:35 -07:00
Nick Kralevich
1e57c156af
Merge "range checking for tnf" into gingerbread
2010-10-15 17:06:30 -07:00
Kenny Root
aa1f79de9b
Merge "Import revised translations DO NOT MERGE" into gingerbread
2010-10-15 16:55:40 -07:00
Jeff Brown
86e69e2339
Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread
2010-10-15 16:52:10 -07:00
Jeff Brown
9b39c7a79a
Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread
2010-10-15 16:52:02 -07:00
Justin Ho
35c4b498bc
Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread
2010-10-15 16:43:42 -07:00
Jeff Brown
b13d7b5cf0
Fix a native crash in input dispatcher when windows are removed.
...
Bug: 3101826
Change-Id: I040838600a6105c8d9f3235025dc0a7b5b27da2e
2010-10-15 16:20:51 -07:00
Jeff Brown
d9dd44d867
Add support for secure system overlays. (DO NOT MERGE)
...
This change adds a new window type for secure system overlays
created by the system itself from non-secure system overlays that
might be created by applications that have the system alert permission.
Secure views ignore the presence of secure system overlays.
Bug: 3098519
Change-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07
2010-10-15 16:03:35 -07:00
Shimeng (Simon) Wang
fbccbe1d16
Merge "DO NOT MERGE" into gingerbread
2010-10-15 15:17:22 -07:00
Andreas Huber
a28340d545
Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
2010-10-15 14:58:54 -07:00
Andreas Huber
4b9f330f25
Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
2010-10-15 14:58:05 -07:00
Dianne Hackborn
3f2bb59fd3
Merge "Work on issue #3101415 : Crespo apps seem to have their UID changed over time." into gingerbread
2010-10-15 14:55:06 -07:00
Irfan Sheriff
306bb9fe6a
Merge "fix build DO NOT MERGE" into gingerbread
2010-10-15 14:30:36 -07:00
Justin Ho
bdcc5ce05a
Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread
2010-10-15 14:26:08 -07:00
Shimeng (Simon) Wang
c255165d89
Merge "DO NOT MERGE" into gingerbread
2010-10-15 14:07:29 -07:00
Leon Scroggins
151b9d0a0b
Merge "Line up textfield with WebTextView more often." into gingerbread
2010-10-15 13:58:38 -07:00
Irfan Sheriff
53d30c41e3
Merge "fetch macaddr right after supplicant connection" into gingerbread
2010-10-15 13:42:38 -07:00
Scott Main
aad5711b5a
am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
...
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread
* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
docs: fix typo; surface dev guide link in package description
2010-10-15 12:35:04 -07:00
Scott Main
8d7a285c3a
am 09da9609: docs: fix code snippet errors
...
Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread
* commit '09da96099917141f2b90d53f61baa822bdd434d7':
docs: fix code snippet errors
2010-10-15 12:34:50 -07:00
Justin Ho
d4305a0001
Merge "DO NOT MERGE - Updated ADB icon" into gingerbread
2010-10-15 11:53:49 -07:00
Nick Pelly
0f5fe63019
Merge "NFC: Move NFC service implementation out of system_server." into gingerbread
2010-10-15 10:55:11 -07:00
Scott Main
23e026b474
Merge "docs: fix typo; surface dev guide link in package description" into froyo
2010-10-15 10:46:33 -07:00
Nick Kralevich
8f424f999e
Merge "Update the documentation for content provider security." into gingerbread
2010-10-15 09:17:12 -07:00
Andreas Huber
b515501d04
Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread
2010-10-15 08:49:31 -07:00
