Commit Graph

18302 Commits

Author SHA1 Message Date
Irfan Sheriff
e6f5e643e6 am df59f257: Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread
Merge commit 'df59f257583730470085db65c7faf44960c3b32e' into gingerbread-plus-aosp

* commit 'df59f257583730470085db65c7faf44960c3b32e':
  DO NOT MERGE Enable debug in StatusBarService
2010-09-20 20:02:32 -07:00
Irfan Sheriff
b98e0dd728 Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread 2010-09-20 19:51:39 -07:00
Mike Lockwood
4313b5a780 am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread
Merge commit '307aef01257cbba42f095f7020a4a3b753f3807b' into gingerbread-plus-aosp

* commit '307aef01257cbba42f095f7020a4a3b753f3807b':
  LocationManager: Hide location provider and geocode provider APIs.
2010-09-20 17:19:04 -07:00
Mike Lockwood
abbf805c91 Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 2010-09-20 17:16:03 -07:00
Dianne Hackborn
44bfeb931d am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp

* commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.
2010-09-20 17:06:12 -07:00
Dianne Hackborn
2f516cddac Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 2010-09-20 17:03:15 -07:00
Dianne Hackborn
295b9e65f0 am 4db643eb: Merge "In theory the package manager now scans /vendor/app" into gingerbread
Merge commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3' into gingerbread-plus-aosp

* commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3':
  In theory the package manager now scans /vendor/app
2010-09-20 16:57:05 -07:00
Dianne Hackborn
6473500135 Merge "In theory the package manager now scans /vendor/app" into gingerbread 2010-09-20 16:54:22 -07:00
Scott Main
259c28f6f0 am a4270e7e: am 73e150c8: provide link to backup guide above the fold
Merge commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp

* commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa':
  provide link to backup guide above the fold
2010-09-20 16:40:46 -07:00
Scott Main
37f2d1a005 am 73e150c8: provide link to backup guide above the fold
Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread

* commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed':
  provide link to backup guide above the fold
2010-09-20 16:37:32 -07:00
Dianne Hackborn
dd7b6bb3f9 am 8e1b84e7: Merge "Some battery improvements:" into gingerbread
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements:
2010-09-20 16:34:45 -07:00
Dianne Hackborn
95ca338d1a Merge "Some battery improvements:" into gingerbread 2010-09-20 16:29:42 -07:00
Mindy Pereira
fb744481e5 am d3301e9f: Add mdpi images for overscroll EdgeGlow.
Merge commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c' into gingerbread-plus-aosp

* commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c':
  Add mdpi images for overscroll EdgeGlow.
2010-09-20 15:49:51 -07:00
Steve Howard
4f2f7f6421 am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp

* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
  New error status for "destination file already exists".
2010-09-20 15:43:43 -07:00
Steve Howard
642b2d271d Merge "New error status for "destination file already exists"." into gingerbread 2010-09-20 15:40:41 -07:00
John Wang
bf7dd2c98f am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread
Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp

* commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
  Use PhoneBase in the phone list.
2010-09-20 15:38:40 -07:00
John Wang
6a9165006d Merge "Use PhoneBase in the phone list." into gingerbread 2010-09-20 15:35:02 -07:00
Brian Swetland
d77cec91b0 am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread
Merge commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp

* commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760':
  support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
2010-09-20 14:08:46 -07:00
Brian Swetland
ef7b152fad Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 2010-09-20 14:05:25 -07:00
Brian Swetland
2b9e4f6a24 support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
2010-09-20 12:58:15 -07:00
Hung-ying Tyan
63c117f5be am 8544560c: SipPhone: fix missing-call DisconnectCause feedback
Merge commit '8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp

* commit '8544560ccc43de7ff49d91866f461f5572f0b147':
  SipPhone: fix missing-call DisconnectCause feedback
2010-09-20 00:51:07 -07:00
Hung-ying Tyan
64ec5c1f2a am b17eae9e: SipService: move event handling out of system server\'s main thread
Merge commit 'b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp

* commit 'b17eae9e227475a323f61519abc8a7d35ddf8828':
  SipService: move event handling out of system server's main thread
2010-09-19 19:14:30 -07:00
Hung-ying Tyan
f5b3d27bd7 am 97963794: SIP: convert enum to static final int.
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp

* commit '97963794af1e18674dd111e3ad344d90b16c922c':
  SIP: convert enum to static final int.
2010-09-19 18:56:27 -07:00
Hung-ying Tyan
2ddd3e119d am 5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp

* commit '5b930c49b12bdb1461a18491db768c642c38d498':
  SIP: add config flag for wifi-only configuration.
2010-09-19 18:11:44 -07:00
Hung-ying Tyan
ad50813521 Merge "SIP: add config flag for wifi-only configuration." into gingerbread 2010-09-19 18:02:13 -07:00
Mike Lockwood
376cdd6d59 am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Merge commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp

* commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b':
  DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
2010-09-19 11:10:57 -07:00
Adam Powell
cc89e1208f am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp

* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
  Fix some drawing artifacts/bugs around overlays/text anchors
2010-09-17 19:30:03 -07:00
Jeff Brown
7fa048f295 am 7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread
Merge commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b' into gingerbread-plus-aosp

* commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b':
  Reduce lock thrashing in native Looper.
2010-09-17 19:29:50 -07:00
Adam Powell
1f6bf40676 Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread 2010-09-17 19:15:38 -07:00
Jeff Brown
1396874273 Merge "Reduce lock thrashing in native Looper." into gingerbread 2010-09-17 17:26:02 -07:00
Jeff Brown
ed242de3f5 Reduce lock thrashing in native Looper.
In the common case, there is nothing interesting happening on the native
Looper besides occasional wake ups.  There is no point grabbing the
semaphore then.

Change-Id: Ib5c426d0e158dfa37891b7ff5537b6f833592fad
2010-09-17 17:01:23 -07:00
Adam Powell
a6e7b5f538 am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread
Merge commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266' into gingerbread-plus-aosp

* commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266':
  Fix silly touch bug in TextView. Oops.
2010-09-17 15:46:07 -07:00
Marco Nelissen
b89a986dd9 am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp

* commit 'f30fae63389a2216faf55636b95a08f35b5c3620':
  Add a check to track a problem the monkey script has been triggering.
2010-09-17 15:42:21 -07:00
Adam Powell
8d978cdd29 Merge "Fix silly touch bug in TextView. Oops." into gingerbread 2010-09-17 15:41:11 -07:00
Marco Nelissen
448aadc2c7 Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread 2010-09-17 15:39:00 -07:00
Dianne Hackborn
e5e647f98e am 58e0eefe: Improve power tracking of WIFI use.
Merge commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp

* commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
  Improve power tracking of WIFI use.
2010-09-17 15:20:10 -07:00
John Wang
9ce04dbeb2 am 0741a5ed: Merge "Add debug function." into gingerbread
Merge commit '0741a5ed38757ef2f6b52945ad494d965b3b83de' into gingerbread-plus-aosp

* commit '0741a5ed38757ef2f6b52945ad494d965b3b83de':
  Add debug function.
2010-09-17 15:06:44 -07:00
John Wang
116d91b4aa Merge "Add debug function." into gingerbread 2010-09-17 15:03:01 -07:00
Adam Powell
b68a497479 am b08013c3: Added overlay support for drawing/responding to text anchors.
Merge commit 'b08013c312e3d849029a2f4c11889274c00f438d' into gingerbread-plus-aosp

* commit 'b08013c312e3d849029a2f4c11889274c00f438d':
  Added overlay support for drawing/responding to text anchors.
2010-09-17 14:53:43 -07:00
Jeff Brown
8d5bf38892 am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Merge commit '838e93ed19879ce3d88b5be51630137d6a6999c6' into gingerbread-plus-aosp

* commit '838e93ed19879ce3d88b5be51630137d6a6999c6':
  Looper: Drop default parameters in favor of a safer overload.
2010-09-17 13:30:20 -07:00
Jeff Brown
e0e09d4771 Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread 2010-09-17 13:25:55 -07:00
Chet Haase
400a478227 am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp

* commit '4a2b3ef1810135bea25a827d7c52767f50c528b6':
  new assets
2010-09-17 13:14:58 -07:00
Chet Haase
14811c08df Merge "new assets" into gingerbread 2010-09-17 13:10:54 -07:00
Andreas Huber
ec118a4760 am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
Merge commit 'f98197a7274c2d7da647f52b3d8b0c74492139af' into gingerbread-plus-aosp

* commit 'f98197a7274c2d7da647f52b3d8b0c74492139af':
  Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
2010-09-17 12:50:45 -07:00
Andreas Huber
0b81a4309d am 524e6f62: Register the new OMX components.
Merge commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c' into gingerbread-plus-aosp

* commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c':
  Register the new OMX components.
2010-09-17 12:50:35 -07:00
Hung-ying Tyan
5ef59746b6 am 1d158357: SipPhone: do not append SIP domain to PSTN number
Merge commit '1d1583573d2099756bbbeef48d97c280edc393e0' into gingerbread-plus-aosp

* commit '1d1583573d2099756bbbeef48d97c280edc393e0':
  SipPhone: do not append SIP domain to PSTN number
2010-09-17 02:03:39 -07:00
Hung-ying Tyan
7538760ca7 am afa583e6: SipAudioCall: expose startAudio()
Merge commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7' into gingerbread-plus-aosp

* commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7':
  SipAudioCall: expose startAudio()
2010-09-17 01:01:07 -07:00
Tadashi G. Takaoka
63f042cd80 am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Merge commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be' into gingerbread-plus-aosp

* commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be':
  Initialize Keyboard.Key attributes from parent Keyboard.Row
2010-09-17 00:03:32 -07:00
Tadashi G. Takaoka
c2f4b6096d Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread 2010-09-17 00:01:19 -07:00
Brian Carlstrom
3fcfb4e68b am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread
Merge commit '987ba54127caaaa87056965b3d98b7e1a5b110b7' into gingerbread-plus-aosp

* commit '987ba54127caaaa87056965b3d98b7e1a5b110b7':
  Fix sim-eng build on Hardy
2010-09-16 23:51:31 -07:00