Commit Graph

18292 Commits

Author SHA1 Message Date
Erik
3af74f9874 am 426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp

* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
  Fixes some bugs in TimeZoneUtils
2010-09-14 16:19:03 -07:00
Jeff Brown
4f5d8bf9a1 am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp

* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
  Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-14 15:32:03 -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
5e4cf02dfe am b3ffc78f: Merge "Add logging of various important graphics events" into gingerbread
Merge commit 'b3ffc78f3432344702e6f5232067ab624083cad2' into gingerbread-plus-aosp

* commit 'b3ffc78f3432344702e6f5232067ab624083cad2':
  Add logging of various important graphics events
2010-09-14 15:14:10 -07:00
Mathias Agopian
959d007a86 Merge "Add logging of various important graphics events" into gingerbread 2010-09-14 15:11:33 -07:00
jsh
72a1b25e88 am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread
Merge commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4' into gingerbread-plus-aosp

* commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4':
  Unhide GsmCellLocation.getPsc().
2010-09-14 15:05:53 -07:00
jsh
651a0519a9 Merge "Unhide GsmCellLocation.getPsc()." into gingerbread 2010-09-14 15:02:46 -07:00
Eric Laurent
a5dd331043 am eea35ce8: Merge "Added intents for audio effects control application" into gingerbread
Merge commit 'eea35ce87f179098215b590fbb21162cca5ff8da' into gingerbread-plus-aosp

* commit 'eea35ce87f179098215b590fbb21162cca5ff8da':
  Added intents for audio effects control application
2010-09-14 13:05:22 -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
c368573cd1 am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
Merge commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b' into gingerbread-plus-aosp

* commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b':
  Fix problem where power manager was calling battery stats with bad wl type.
2010-09-14 12:31:07 -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
b51030fbf0 am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
Merge commit 'b92788aa040d0971b4e54589aef7675f34d96e5d' into gingerbread-plus-aosp

* commit 'b92788aa040d0971b4e54589aef7675f34d96e5d':
  Adds time zone functionality into fw as a hidden api
2010-09-14 12:25:31 -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
991abcb98a am 934516e1: Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread
Merge commit '934516e10150874fd1db5ab9e0be3ae793441fd8' into gingerbread-plus-aosp

* commit '934516e10150874fd1db5ab9e0be3ae793441fd8':
  Fix issue #2999795: Runtime restart on Crespo
2010-09-14 11:54:28 -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
08df773b12 am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
Merge commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf' into gingerbread-plus-aosp

* commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf':
  Unify some duplicate StrictMode-enabling code.
2010-09-14 11:39:54 -07:00
Brad Fitzpatrick
553270cc55 am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread
Merge commit 'fb85bc66c467be96fe8420338321df6f15359d7d' into gingerbread-plus-aosp

* commit 'fb85bc66c467be96fe8420338321df6f15359d7d':
  Add missing wallpaper service lock.
2010-09-14 11:39:43 -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
60e96a56b4 am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
Merge commit '52e19d5917b8f057131c1dc8b3eb772febd791d9' into gingerbread-plus-aosp

* commit '52e19d5917b8f057131c1dc8b3eb772febd791d9':
  Change the keep alive time for excess idle threads.
2010-09-14 11:36:55 -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
fe9f855c4e am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp

* commit '405d4db50b3db1fc5e015475218e190d193332d4':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-14 11:29:57 -07:00
Brian Carlstrom
4128f7c02b am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp

* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -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
5b86c15a4b am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread
Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp

* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
  Return immutable copies of private callList.
2010-09-14 10:31:45 -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
e95f395c15 am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp

* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
  Add an option to hide the Voice Search icon.
2010-09-14 10:26:44 -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
fed3a15b28 am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
Merge commit '89a7180a242043a0b4d6695bf386c93365bf6797' into gingerbread-plus-aosp

* commit '89a7180a242043a0b4d6695bf386c93365bf6797':
  SipService: ignore connect event for non-active networks.
2010-09-14 10:00:14 -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
1ed654740c am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit 'e71396cf4704ee9e26f510b511c1e793d8048d83' into gingerbread-plus-aosp

* commit 'e71396cf4704ee9e26f510b511c1e793d8048d83':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:46:44 -07:00
Kenny Root
1bf8fd86c2 am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp

* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
  Dedupe timestamp in PackageSettings
2010-09-14 09:46:40 -07:00
Hung-ying Tyan
18747f78c6 am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()
Merge commit '13f6270eb14b409709c936b828e2a2fd40e427c4' into gingerbread-plus-aosp

* commit '13f6270eb14b409709c936b828e2a2fd40e427c4':
  SipAudioCall: use SipErrorCode instead of string in onError()
2010-09-14 09:44:03 -07:00
Hung-ying Tyan
77d35e00bc am 99bf4e45: SIP: remove dependency on javax.sip
Merge commit '99bf4e45c4566172189735b34b368b76660ca57a' into gingerbread-plus-aosp

* commit '99bf4e45c4566172189735b34b368b76660ca57a':
  SIP: remove dependency on javax.sip
2010-09-14 09:43:54 -07:00
Chung-yih Wang
55711d5b9c am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
Merge commit '5dde95b8fe0fea1a115a68f8acf826371da89da7' into gingerbread-plus-aosp

* commit '5dde95b8fe0fea1a115a68f8acf826371da89da7':
  Fix the bug of authentication in an outgoing call.
2010-09-14 09:43:46 -07:00
Jaikumar Ganesh
16a1e21491 am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
Merge commit 'a224f70b1efc29d9698da5b5c143251a43838f2b' into gingerbread-plus-aosp

* commit 'a224f70b1efc29d9698da5b5c143251a43838f2b':
  Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-14 09:43:31 -07:00
Hung-ying Tyan
9e0d33cebd am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp

* commit '4565933f03a99750a333e97e95408c404984510f':
  SipService: deliver connectivity change to all sessions.
2010-09-14 09:43:17 -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
47200f78a6 am 5251c800: Merge "Fix potential crash in sync." into gingerbread
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp

* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
  Fix potential crash in sync.
2010-09-13 17:26:34 -07:00
Dianne Hackborn
ac306f576b Merge "Fix potential crash in sync." into gingerbread 2010-09-13 17:21:04 -07:00
Dianne Hackborn
6b6818ff62 am a0eb56ac: Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread
Merge commit 'a0eb56ac59751ab7fb060980e14edcacca439635' into gingerbread-plus-aosp

* commit 'a0eb56ac59751ab7fb060980e14edcacca439635':
  Work on issue #2991868: A toast pops up informing users...
2010-09-13 17:17:19 -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
c87304626d am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
Merge commit 'b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp

* commit 'b07c078921fb917d33075a63d77fdf98221e2bac':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
2010-09-13 16:11:55 -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