Dianne Hackborn
dd22cef3dd
Merge "Avoiding cyclic references when unbinding from a service"
2011-01-07 00:43:15 -08:00
Dianne Hackborn
611040bae9
Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
2011-01-05 19:10:15 -08:00
Jean-Baptiste Queru
19104d5357
Merge "according to rfc2617, nc-value = 8LHEX"
2010-12-28 15:33:10 -08:00
Jean-Baptiste Queru
fb1a3da503
Merge "Fix for writing empty strings to Parcel::writeString8()"
2010-12-28 11:25:50 -08:00
Jean-Baptiste Queru
44086a0039
Merge "The phone is crashing when unknown mime content is transferred."
2010-12-28 10:34:02 -08:00
Dianne Hackborn
d3994f5183
Merge "frameworks/base: Fix to release references to previous live wallpaper"
2010-12-23 14:17:54 -08:00
Dianne Hackborn
37d273cbf0
Merge "frameworks/base: Fix to release references in ActivityManagerService"
2010-12-23 14:14:38 -08:00
Dianne Hackborn
0ca8fbb1cc
Merge "Improve performance of WindowState.toString()"
2010-12-22 11:21:21 -08:00
Pravat Dalbehera
d1dff8d4d4
Fix for writing empty strings to Parcel::writeString8()
...
If writeString8 is called with the following sequence:
writeString8(String8(""));
writeString8(String8("TempString"));
Then in the readString8, the 2nd String i.e. "TempString" is not read,
instead an empty string is read.
The bug comes because of the write call for String8("") where there are
no String bytes present. In the write Statement, an extra ‘\0’ is
written. During the Marshalling, Following bytes are written:
1 2 3 4 5 ...
0x0 0x0 0xB ‘T’ ‘e’ ...
The readString8 function has a check that, if String length is 0, don’t
read anything. So the first byte is read as the length for the first
string. The second byte i.e. ‘\0’ is read as the length for the second
string and hence the second string becomes empty too.
Change-Id: Id7acc0c80ae16e77be4331f1ddf69ea87e758420
2010-12-22 12:57:31 +01:00
Jean-Baptiste Queru
decfba4df7
Merge "Support for KSC5601 on SIM."
2010-12-21 10:27:14 -08:00
Jean-Baptiste Queru
fae89a5076
resolved conflicts for merge of 4b94c451 to stage-korg-master
...
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
2010-12-13 13:06:13 -08:00
Jean-Baptiste Queru
3436320d8f
Merge "Added dropbox broadcast notification"
2010-12-13 12:34:48 -08:00
Wink Saville
3c41ac797a
am 19b23afa: Merge "Fix for phone app crash in Icc Card."
...
* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
Fix for phone app crash in Icc Card.
2010-12-09 13:58:26 -08:00
Wink Saville
d4d8eb5060
Merge "Fix for phone app crash in Icc Card."
2010-12-09 13:50:28 -08:00
Jean-Baptiste Queru
062afde24e
merge from gingerbread
...
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
2010-12-09 09:11:06 -08:00
Wink Saville
3495638091
am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
...
* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:53:24 -08:00
Wink Saville
bf741e9dfc
Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
2010-12-08 21:37:38 -08:00
Wink Saville
9d6ca87ee1
am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
...
* commit '2b858caecb3c293c47b48eed12a55a49e3039874':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2010-12-07 22:18:14 -08:00
Wink Saville
b56a7b062d
Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
2010-12-07 21:57:53 -08:00
Jean-Baptiste Queru
f83c5e5eee
resolved conflicts for merge of 78742e01 to stage-korg-master
...
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
2010-12-07 12:51:49 -08:00
Jean-Baptiste Queru
d4d1d5a02b
Merge "Strings for NI position request are moved to resources"
2010-12-07 12:01:25 -08:00
Jean-Baptiste Queru
64b556bdc9
am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
2010-12-06 13:43:36 -08:00
Jean-Baptiste Queru
58b879a8f6
Merge "Changing connect and response timeout."
2010-12-06 13:39:19 -08:00
Jean-Baptiste Queru
9d2e1882cb
am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
...
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
2010-12-06 11:03:11 -08:00
Jean-Baptiste Queru
907333ec69
Merge "NumberPicker: Set formatter local value to US."
2010-12-06 10:57:04 -08:00
Jean-Baptiste Queru
a4130babac
resolved conflicts for merge of bf1439c5 to stage-korg-master
...
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
2010-12-02 15:16:53 -08:00
Jean-Baptiste Queru
7a039f9994
Merge "Preserve flags field of event passed to injectKeyEvent()"
2010-12-02 14:56:13 -08:00
Jean-Baptiste Queru
4bdada2c61
Merge from open-source master
...
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
2010-12-02 07:55:06 -08:00
Jean-Baptiste Queru
af8964280b
Merge from open-source master
...
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
2010-12-02 07:54:57 -08:00
Jean-Baptiste Queru
6c48212132
Merge "Fix crash by "adb shell pm list permissions -f|-s""
2010-12-01 09:47:14 -08:00
Jean-Baptiste Queru
459ae1107f
Merge "Fix HTTP redirect missing statuscode 303 and 307"
2010-12-01 08:25:12 -08:00
Trevor Johns
88d3f106bf
am 210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
...
* commit '210e9c4a8b1fdbe9c409f9ce426907587430858a':
Revert "Disabling AccessibilityService sample from build system."
2010-11-24 16:23:47 -08:00
Trevor Johns
ccacf00df2
Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
2010-11-24 16:21:16 -08:00
Xia Wang
eb536090ef
am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
...
* commit 'c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
Add Wi-Fi tests for static IP. DO NOT MERGE
2010-11-24 13:29:56 -08:00
Xia Wang
5cfbd426a4
Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
2010-11-24 13:27:53 -08:00
Scott Main
57087147ef
am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820
...
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:43:08 -08:00
Scott Main
03ffe08783
am 3577f51d: docs: clarify <include> layout properties bug: 3227820
...
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:39:42 -08:00
Jean-Baptiste Queru
ec756056ab
am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
...
* commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
frameworks/base: Destroy the overlay even if there is an error
2010-11-23 11:14:57 -08:00
Jean-Baptiste Queru
4e8fa27b4e
Merge "frameworks/base: Destroy the overlay even if there is an error"
2010-11-23 11:02:09 -08:00
Gloria Wang
8cec955963
am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
...
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
2010-11-22 21:26:13 -08:00
Gloria Wang
81ee631fd5
am d9334934: Merge "Update of DRM Framework."
...
* commit 'd93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
2010-11-22 21:25:56 -08:00
Gloria Wang
6772c2d92d
Merge "Notify the playback status to DRM agents before the playback starts"
2010-11-22 21:15:07 -08:00
Gloria Wang
80b7966f1f
Merge "Update of DRM Framework."
2010-11-22 21:14:09 -08:00
Jean-Baptiste Queru
37e7e9e052
resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp
...
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
2010-11-22 16:32:34 -08:00
Jean-Baptiste Queru
dba567c4ae
Merge "Enabling cell broadcast (SMS-CB) support in the platform."
2010-11-22 15:59:04 -08:00
Xia Wang
07db9276c0
am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
...
* commit '5df8c155872833647ac56951ab90bd26a9af9480':
Add Wifi Tethering stress test
2010-11-22 14:46:33 -08:00
Xia Wang
14073fb621
Merge "Add Wifi Tethering stress test" into gingerbread
2010-11-22 14:44:49 -08:00
Naomi Luis
29a73ba845
frameworks/base: Destroy the overlay even if there is an error
...
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.
Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
2010-11-22 14:03:18 -08:00
Scott Main
30a731e6c5
am 8fac7c2e: change sdk version variable to 2.3 (for docs)
...
* commit '8fac7c2edc433b6c7d153caac238fef595133663':
change sdk version variable to 2.3 (for docs)
2010-11-22 13:55:55 -08:00
Jean-Baptiste Queru
a96d0edeef
am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
...
* commit 'b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
2010-11-22 13:44:56 -08:00