Eric Fischer
6207a8e760
am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
Import revised translations. DO NOT MERGE
2011-04-04 12:20:38 -07:00
Jason parks
5c952fc1d3
am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
Send out a broadcast that the system is being factory reset.
2011-04-04 12:20:33 -07:00
Justin Ho
6e8e2655a0
am 87805ca3: Updated CDMA roaming icons
...
* commit '87805ca3a477e165891baa18efe5239a70d11bc9':
Updated CDMA roaming icons
2011-04-04 12:19:39 -07:00
Jean-Baptiste Queru
6952674762
am bef31431: No-op - reconcile with open-source gingerbread
...
* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':
2011-04-04 12:19:26 -07:00
Robert Greenwalt
8e5a5361d3
am 27725e8c: Only leave one default network up at a time.
...
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
Only leave one default network up at a time.
2011-04-04 12:18:58 -07:00
Robert Greenwalt
eaea127a8b
Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp
2011-04-04 11:23:51 -07:00
Robert Greenwalt
544de0b31f
resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp
...
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
2011-04-04 11:21:23 -07:00
Brad Fitzpatrick
c0c45b0dd0
am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
...
* commit '9907d161584415c81de1099678f160da172fd1a6':
Fix data corruption when writing to Bluetooth socket
2011-04-04 11:03:03 -07:00
Brad Fitzpatrick
5e29d67d7c
Merge "Fix data corruption when writing to Bluetooth socket"
2011-04-04 10:49:05 -07:00
Brad Fitzpatrick
e40f8ffe51
am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
...
* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
2011-04-04 10:17:43 -07:00
Brad Fitzpatrick
8deedde475
am e558a000: Merge "Avoid crash in system server when mounting container"
...
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
Avoid crash in system server when mounting container
2011-04-04 10:17:35 -07:00
Brad Fitzpatrick
9f3c59adc5
Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
2011-04-04 09:41:10 -07:00
Brad Fitzpatrick
7ac7f79133
Merge "Avoid crash in system server when mounting container"
2011-04-04 09:38:16 -07:00
Jason parks
bef49808c7
Merge "Implement teardown script." into gingerbread
2011-04-01 13:11:06 -07:00
MÃ¥rten Kongstad
5f29c87ef2
Runtime resource overlay, iteration 1.
...
Runtime resource overlay allows unmodified applications to appear
as if they had been compiled with additional resources defined. See
libs/utils/README for more information.
This commit is the first iteration of runtime resource overlay. It
provides the actual overlay modifications and loading of trusted overlay
packages (ie residing in /vendor) targeting framework-res.apk.
This commit loads exactly one overlay package. The overlay,
if present, must target framework-res.apk and be located at
/vendor/overlay/framework/framework-res.apk.
Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
2011-04-01 14:12:10 +02:00
Russell Brenner
7faee43a9d
am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable
...
* commit 'c6b22e2727bd3730edd5ad72831a9bb4670d00f3':
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
2011-03-31 18:55:26 -07:00
Russell Brenner
8fa06d3579
am 49b49f8f: Added include/private/hwui/DrawGlInfo.h
...
* commit '49b49f8fb6d094768d4e093353b34271f2da1bfc':
Added include/private/hwui/DrawGlInfo.h
2011-03-31 18:55:20 -07:00
Russell Brenner
0686717d79
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
...
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
2011-03-31 17:40:08 -07:00
James Dong
2688dddfd2
Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
2011-03-31 11:20:40 -07:00
nao
28bcfd4e9d
modify the device to enable to get the state as slide-open/slide-close.
...
This modify is for the devices which have a slidable H/W keyboard with backlight.
For example of current issues:
- Backlight of H/W keyboard doesn't turn on when the device starts up with slide-open.
- Home screen doesn't display with proper orientation when the device starts up with slide-open.
Change-Id: I6a6a18d0b09d0ba484ca992c9fb34f24de9bf21b
2011-03-31 11:53:15 +09:00
Eric Laurent
ce75529174
Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
2011-03-30 14:55:49 -07:00
Mike Lockwood
6de2e32fd3
Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
2011-03-30 14:15:51 -07:00
Trevor Johns
e4e971ee13
Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
2011-03-30 13:50:40 -07:00
Simon Wilson
ae9739aec3
Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
2011-03-30 13:26:45 -07:00
Eric Fischer
8ee2f9df92
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-30 10:41:05 -07:00
Jeff Hamilton
105d6527dd
am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
...
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 09:30:40 -07:00
Irfan Sheriff
51af9642fd
am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
...
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
DO NOT MERGE Pick upstream intf with valid IP conf
2011-03-30 09:30:32 -07:00
Robert Greenwalt
4f90fda71f
am 568845a7: Merge "Fix some alt-network issues." into gingerbread
...
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
Fix some alt-network issues.
2011-03-30 09:30:15 -07:00
Jason parks
00607ddaee
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
2011-03-30 08:17:53 -07:00
The Android Open Source Project
db14ee1cc2
am ad663d80: Merge from gingerbread
...
* commit 'ad663d8040ddd4f3e537117847f20d42797b429e':
egl: fixes for object refcounts
2011-03-29 15:23:08 -07:00
Jean-Baptiste Queru
825370ebef
No-op - reconcile with open-source gingerbread
...
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
2011-03-29 14:05:53 -07:00
The Android Open Source Project
1a1b70fbfa
Merge from gingerbread
...
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
2011-03-29 13:54:43 -07:00
Michael I. Gold
894c1459c1
egl: fixes for object refcounts
...
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-03-29 13:43:54 -07:00
Brad Fitzpatrick
eb797b1fd5
am 1e7fb7ae: Merge "Error in compound cache-control header."
...
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
Error in compound cache-control header.
2011-03-29 09:27:16 -07:00
Brad Fitzpatrick
13e41db3a1
Merge "Error in compound cache-control header."
2011-03-29 08:55:02 -07:00
Brad Fitzpatrick
7dba70e98f
am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
...
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-28 08:26:02 -07:00
Brad Fitzpatrick
587b9dc7b6
am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
...
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
Unregister callback from binder when vibration is removed
2011-03-28 08:15:35 -07:00
Brad Fitzpatrick
199f567fc7
Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
2011-03-28 08:13:08 -07:00
Brad Fitzpatrick
a57bf3d09b
Merge "Unregister callback from binder when vibration is removed"
2011-03-28 07:59:08 -07:00
Robert Greenwalt
f9a75b96bd
Merge "Fix Default route after secondary net use." into gingerbread
2011-03-26 08:58:01 -07:00
Jeff Hamilton
fbf4a75c57
Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
2011-03-25 14:53:14 -07:00
Irfan Sheriff
fce4eab91a
Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
2011-03-25 11:01:02 -07:00
Robert Greenwalt
9028577960
Merge "Fix some alt-network issues." into gingerbread
2011-03-25 09:35:53 -07:00
Jeff Hamilton
618cfd6e85
am 9c1ef098: Update the value for the NFC shared UID.
...
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
Update the value for the NFC shared UID.
2011-03-24 20:21:41 -07:00
Bart Sears
89c36f4b85
am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
...
* commit '6a19759c0fae744e80c032ca3c23932e73e6d9d9':
Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-24 03:36:31 -07:00
Huahui Wu
98e4ec6578
am f440831d: DO NOT MERGE
...
* commit 'f440831d76817e837164ca18c7705e81d2391f87':
DO NOT MERGE
2011-03-24 03:35:59 -07:00
Brad Fitzpatrick
1ec98a1eb5
am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
...
* commit '2e383bc6445b37d3b37fbc5b7620cd4716c5692c':
Making it possible to call SIP calls with special allowed chars.
2011-03-23 12:44:23 -07:00
Brad Fitzpatrick
133232d829
am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
...
* commit '5d5a0ca5ebc3f4f60b5ad2afc161b3b8b33953e7':
Fixing the wrong link in YuvImage JavaDoc.
2011-03-23 12:44:18 -07:00
Brad Fitzpatrick
2fc222d9cf
Merge "Making it possible to call SIP calls with special allowed chars."
2011-03-23 12:33:39 -07:00
Brad Fitzpatrick
eb6bc968dd
Merge "Fixing the wrong link in YuvImage JavaDoc."
2011-03-23 12:30:28 -07:00