Robert Greenwalt
bcd2ed6d32
Merge "Update Inet Connection Status display" into gingerbread
2010-09-15 17:59:54 -07:00
Michael I. Gold
7f198b6bff
surfaceflinger / GL extensions cleanup
...
Add correct enumerants for OES_EGL_image_external to glext.h.
SurfaceFlinger now checks for the correct extension name.
Change-Id: I2ba2728a01fa2260bd086d2df4316c68f694a9b1
2010-09-15 17:15:31 -07:00
Andreas Huber
c9d0991a29
Merge "Upgrade to the latest .webm project code." into gingerbread
2010-09-15 16:23:06 -07:00
Erik
15caeb81ad
Merge "b/3004029 Fixed content resolver loss" into gingerbread
2010-09-15 15:51:53 -07:00
Erik
aaab513852
Merge "Close tz query cursor when done." into gingerbread
2010-09-15 15:51:37 -07:00
Chet Haase
a295cadc65
Merge "Add new/changed drawable assets from design team" into gingerbread
2010-09-15 15:33:31 -07:00
Wu-cheng Li
0182b666c5
Merge "Update camera API and javadoc for API review comments." into gingerbread
2010-09-15 14:57:59 -07:00
James Dong
762575bba2
Merge "Add some explicit error log messages" into gingerbread
2010-09-15 14:51:57 -07:00
James Dong
27c4c1f6b0
Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
2010-09-15 14:51:49 -07:00
Hung-ying Tyan
8b419496df
Merge "Fixing the NPE in SipPhone bug id: http://b/2987816 " into gingerbread
2010-09-15 13:02:46 -07:00
Hung-ying Tyan
c29530252a
Merge "Fix links in SIP API javadoc." into gingerbread
2010-09-15 12:56:36 -07:00
Mathias Agopian
6a3de9a424
fix a typo where the eventtags code were wrong
...
Change-Id: I517112a1475c10b71009a0aa9c3894c76a1f270f
2010-09-15 12:46:59 -07:00
Andreas Huber
3b99f526d9
Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread
2010-09-15 11:25:40 -07:00
David Brown
47638c2d8e
Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
2010-09-15 11:11:18 -07:00
Hung-ying Tyan
cccd77aa5b
Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
2010-09-14 23:10:03 -07:00
Hung-ying Tyan
d8af3ea549
Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread
2010-09-14 23:09:26 -07:00
Jeff Brown
b5764e066c
Input API review.
...
Drop currently unsupported input features.
Add documentation comments.
Change-Id: I407d2e1dd90c5ee82983a3ccf177430d35ee7592
2010-09-14 20:46:14 -07:00
Kenny Root
5f47964493
Merge "Free AssetManager weak refs before unmounting" into gingerbread
2010-09-14 18:02:39 -07:00
Steve Howard
7880a38a6e
Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
2010-09-14 17:46:22 -07:00
Chris Palmer
d843af292e
Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
2010-09-14 17:43:31 -07:00
John Wang
cdf8f7064e
Merge "Complete event registration in CallManager." into gingerbread
2010-09-14 16:26:14 -07:00
Jeff Brown
b06cca6228
Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
2010-09-14 15:27:33 -07:00
Mathias Agopian
959d007a86
Merge "Add logging of various important graphics events" into gingerbread
2010-09-14 15:11:33 -07:00
jsh
651a0519a9
Merge "Unhide GsmCellLocation.getPsc()." into gingerbread
2010-09-14 15:02:46 -07:00
Eric Laurent
7568b361cf
Merge "Added intents for audio effects control application" into gingerbread
2010-09-14 13:02:18 -07:00
Dianne Hackborn
71acc203ed
Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
2010-09-14 12:28:08 -07:00
Erik
336da25dda
Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
2010-09-14 12:21:53 -07:00
Dianne Hackborn
a667ca867a
Merge "Fix issue #2999795 : Runtime restart on Crespo" into gingerbread
2010-09-14 11:50:51 -07:00
Brad Fitzpatrick
52b649f02a
Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
2010-09-14 11:37:13 -07:00
Brad Fitzpatrick
e10c4c56e7
Merge "Add missing wallpaper service lock." into gingerbread
2010-09-14 11:37:05 -07:00
Romain Guy
8f8715a1e3
Merge "Change the keep alive time for excess idle threads." into gingerbread
2010-09-14 11:34:01 -07:00
Brian Carlstrom
e565df9d96
Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
2010-09-14 11:15:01 -07:00
John Wang
db608bd7d0
Merge "Return immutable copies of private callList." into gingerbread
2010-09-14 10:28:33 -07:00
Leon Scroggins III
efe02e796b
am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
...
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread
* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
Add an option to hide the Voice Search icon.
2010-09-14 10:23:35 -07:00
Leon Scroggins III
b0d30a12a0
Merge "Add an option to hide the Voice Search icon." into froyo
2010-09-14 10:21:25 -07:00
Hung-ying Tyan
946dc2946e
Merge "SipService: ignore connect event for non-active networks." into gingerbread
2010-09-14 09:57:47 -07:00
Dirk Dougherty
473273b821
am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
...
Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread
* commit '4b4af990af527c79073d546ead1850278caa7a8e':
Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:39:59 -07:00
Kenny Root
cc16981410
Merge "Dedupe timestamp in PackageSettings" into gingerbread
2010-09-14 09:29:48 -07:00
Jeff Brown
59abe7e090
Replace epoll() with poll() and rename PollLoop to Looper.
...
As part of this change, consolidated and cleaned up the Looper API so
that there are fewer distinctions between the NDK and non-NDK declarations
(no need for two callback types, etc.).
Removed the dependence on specific constants from sys/poll.h such as
POLLIN. Instead looper.h defines events like LOOPER_EVENT_INPUT for
the events that it supports. That should help make any future
under-the-hood implementation changes easier.
Fixed a couple of compiler warnings along the way.
Change-Id: I449a7ec780bf061bdd325452f823673e2b39b6ae
2010-09-14 01:59:45 -07:00
Chung-yih Wang
9ee8b4325f
Merge "Fix the bug of authentication in an outgoing call." into gingerbread
2010-09-13 23:31:18 -07:00
Mathias Agopian
35b48d10bc
Add logging of various important graphics events
...
There are 16 events logged in the event log:
SF_APP_DEQUEUE_BEFORE
SF_APP_DEQUEUE_AFTER
SF_APP_LOCK_BEFORE
SF_APP_LOCK_AFTER
SF_APP_QUEUE
SF_REPAINT
SF_COMPOSITION_COMPLETE
SF_UNLOCK_CLIENTS
SF_SWAP_BUFFERS
SF_REPAINT_DONE
SF_FB_POST_BEFORE
SF_FB_POST_AFTER
SF_FB_DEQUEUE_BEFORE
SF_FB_DEQUEUE_AFTER
SF_FB_LOCK_BEFORE
SF_FB_LOCK_AFTER
all events log the buffer conserned and a timestamp in microseconds.
by default the logging is not enabled, to turn it on:
adb shell service call SurfaceFlinger 1006 i31 1
adb shell setprop debug.graphic_log 1
The effect is immediate in SurfaceFlinger, but applications need to be
restarted.
Change-Id: Ifc2e31f7aed072d9a7dede20ff2ce59231edbec1
2010-09-13 23:16:58 -07:00
Hung-ying Tyan
b408acba18
Merge "SipService: deliver connectivity change to all sessions." into gingerbread
2010-09-13 19:53:58 -07:00
Dianne Hackborn
ac306f576b
Merge "Fix potential crash in sync." into gingerbread
2010-09-13 17:21:04 -07:00
Dianne Hackborn
fe460cc23a
Merge "Work on issue #2991868 : A toast pops up informing users..." into gingerbread
2010-09-13 17:14:00 -07:00
Adam Powell
5828da75c4
Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
2010-09-13 16:09:51 -07:00
Irfan Sheriff
6eedaf78bb
Merge "Fix statusbar display of wifi signalstrength" into gingerbread
2010-09-13 16:05:06 -07:00
Shimeng (Simon) Wang
0e152daec3
Merge "DO NOT MERGE" into gingerbread
2010-09-13 11:00:16 -07:00
Eric Laurent
d17ae82cf5
Merge "Fix volume problems with insert revert" into gingerbread
2010-09-13 09:14:39 -07:00
Jeff Brown
37163248ad
Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
2010-09-12 20:45:31 -07:00
Jeff Brown
77b34573ee
Merge "Don't play a sound if a volume key press is canceled." into gingerbread
2010-09-12 18:11:42 -07:00