OSDN Git Service
Jean-Baptiste Queru [Tue, 1 Feb 2011 21:02:19 +0000 (13:02 -0800)]
am
eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '
eb17d6f51a9776f02be84859b8980a6317abd27c':
Don't crash zygote if webcore fails to load
Jean-Baptiste Queru [Tue, 1 Feb 2011 20:41:55 +0000 (12:41 -0800)]
Merge "Don't crash zygote if webcore fails to load"
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:55:40 +0000 (11:55 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:32:33 +0000 (11:32 -0800)]
Merge "stubs"
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:07:25 +0000 (16:07 -0800)]
am
25503f1c: Merge from gingerbread
* commit '
25503f1c9f0b5f718052b71dc5b21d1c8576d015':
fix failing thread object run
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:35:06 +0000 (15:35 -0800)]
Merge from gingerbread
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:33 +0000 (15:17 -0800)]
Merge "fix failing thread object run" into gingerbread
Dianne Hackborn [Sun, 30 Jan 2011 07:01:20 +0000 (23:01 -0800)]
am
25eb0464: Merge "Normalize output from aapt d"
* commit '
25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 06:53:20 +0000 (22:53 -0800)]
Merge "Normalize output from aapt d"
Dianne Hackborn [Sat, 29 Jan 2011 22:59:02 +0000 (14:59 -0800)]
am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
bbb5a5ce1922a168335811b177cd7341350c15cc':
Make AaptGroupEntry::getMncName accept mnc00
Dianne Hackborn [Sat, 29 Jan 2011 22:38:48 +0000 (14:38 -0800)]
Merge "Make AaptGroupEntry::getMncName accept mnc00"
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:39:47 +0000 (07:39 -0800)]
am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
9720323a5138acafbe30da38d61eeac469b675a4':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 14:19:37 +0000 (06:19 -0800)]
stubs
Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
Jean-Baptiste Queru [Fri, 28 Jan 2011 23:26:59 +0000 (15:26 -0800)]
Merge "Delete browerplugin tests - do not merge"
Jeff Brown [Wed, 26 Jan 2011 22:25:08 +0000 (14:25 -0800)]
Merge "Move keymaps from sdk/emulator/keymaps."
Ritu Srivastava [Wed, 26 Jan 2011 00:23:08 +0000 (16:23 -0800)]
fix failing thread object run
A previously exited Thread object refuses to run again, if the
thread-id of the caller, conincides with the thread-id it previously
used in the worker thread. Hence reset the previously used worker
thread-id to -1 when it exits.
Signed-off-by: Ritu Srivastava <rsrivast@sta.samsung.com>
Change-Id: I873925c312a43ec8a16392b98cc959042ff6bfd2
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
Brad Fitzpatrick [Tue, 25 Jan 2011 23:12:18 +0000 (15:12 -0800)]
Merge "android.os.Message: respect sPoolSize"
Brad Fitzpatrick [Mon, 24 Jan 2011 21:36:15 +0000 (13:36 -0800)]
Merge "Avoid using String.format in MediaRecorder"
Dianne Hackborn [Sun, 23 Jan 2011 20:44:13 +0000 (12:44 -0800)]
Merge "aapt: Allow raw "%" in unformatted string-arrays"
Jeff Brown [Sun, 23 Jan 2011 05:23:19 +0000 (21:23 -0800)]
Merge "Fix getSwitchState."
Dianne Hackborn [Sat, 22 Jan 2011 19:26:05 +0000 (11:26 -0800)]
Merge "frameworks/base: Track owner in appropriate owners list of Uri"
Dianne Hackborn [Fri, 21 Jan 2011 17:23:29 +0000 (09:23 -0800)]
Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
Jeff Brown [Thu, 20 Jan 2011 04:35:47 +0000 (20:35 -0800)]
Fix getSwitchState.
InputReader::getSwitchState always returns AKEY_STATE_UNKNOWN
because SwitchInputMapper::getSources() returns 0 which cannot
match any source mask including AINPUT_SOURCE_ANY. As a result
initial lid switch detection is broken.
This change adds a new source constant AINPUT_SOURCE_SWITCH
that indicates that the source has switches.
Change-Id: I5321ecf0ce84f1c2b4535f6c163d3f4dcf9b7a9b
Brad Fitzpatrick [Tue, 18 Jan 2011 21:23:13 +0000 (13:23 -0800)]
Merge "Fixing memory leak in PreferenceScreen."
Brad Fitzpatrick [Tue, 18 Jan 2011 20:59:19 +0000 (12:59 -0800)]
Merge "frameworks/base: remove redundant code in WindowManager"
Dianne Hackborn [Fri, 14 Jan 2011 23:37:56 +0000 (15:37 -0800)]
Merge "Don't drop the drawable cache completely on configuration change"
Dianne Hackborn [Fri, 14 Jan 2011 23:36:58 +0000 (15:36 -0800)]
Merge "Make the Phone options dialog use current language"
Dianne Hackborn [Fri, 14 Jan 2011 23:36:52 +0000 (15:36 -0800)]
Merge "Added check to make orientation calculations more robust"
Gloria Wang [Thu, 13 Jan 2011 18:51:13 +0000 (10:51 -0800)]
Merge "Initial OMA DRM forward lock contribution"
Brad Fitzpatrick [Wed, 12 Jan 2011 23:45:05 +0000 (15:45 -0800)]
Merge "Fix for crash when setting live wallpaper."
Brad Fitzpatrick [Mon, 10 Jan 2011 16:02:03 +0000 (08:02 -0800)]
Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
Romain Guy [Sat, 8 Jan 2011 18:04:32 +0000 (10:04 -0800)]
Merge "Typo in Javadoc"
Gloria Wang [Fri, 7 Jan 2011 19:10:49 +0000 (11:10 -0800)]
Merge "DRM Framework bug fixes."
Dianne Hackborn [Fri, 7 Jan 2011 08:43:15 +0000 (00:43 -0800)]
Merge "Avoiding cyclic references when unbinding from a service"
Dianne Hackborn [Thu, 6 Jan 2011 03:10:15 +0000 (19:10 -0800)]
Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
Shachar Shemesh [Mon, 20 Dec 2010 15:38:33 +0000 (17:38 +0200)]
Normalize output from aapt d
Make the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed
regardless of the content of the strings.
Change-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf
Jean-Baptiste Queru [Tue, 28 Dec 2010 23:33:10 +0000 (15:33 -0800)]
Merge "according to rfc2617, nc-value = 8LHEX"
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:25:50 +0000 (11:25 -0800)]
Merge "Fix for writing empty strings to Parcel::writeString8()"
Jean-Baptiste Queru [Tue, 28 Dec 2010 18:34:02 +0000 (10:34 -0800)]
Merge "The phone is crashing when unknown mime content is transferred."
Dianne Hackborn [Thu, 23 Dec 2010 22:17:54 +0000 (14:17 -0800)]
Merge "frameworks/base: Fix to release references to previous live wallpaper"
Dianne Hackborn [Thu, 23 Dec 2010 22:14:38 +0000 (14:14 -0800)]
Merge "frameworks/base: Fix to release references in ActivityManagerService"
Dianne Hackborn [Wed, 22 Dec 2010 19:21:21 +0000 (11:21 -0800)]
Merge "Improve performance of WindowState.toString()"
Pravat Dalbehera [Wed, 15 Dec 2010 07:40:00 +0000 (08:40 +0100)]
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
Jean-Baptiste Queru [Tue, 21 Dec 2010 18:27:14 +0000 (10:27 -0800)]
Merge "Support for KSC5601 on SIM."
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:06:13 +0000 (13:06 -0800)]
resolved conflicts for merge of
4b94c451 to stage-korg-master
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
Jean-Baptiste Queru [Mon, 13 Dec 2010 20:34:48 +0000 (12:34 -0800)]
Merge "Added dropbox broadcast notification"
Wink Saville [Thu, 9 Dec 2010 21:58:26 +0000 (13:58 -0800)]
am
19b23afa: Merge "Fix for phone app crash in Icc Card."
* commit '
19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
Fix for phone app crash in Icc Card.
Wink Saville [Thu, 9 Dec 2010 21:50:28 +0000 (13:50 -0800)]
Merge "Fix for phone app crash in Icc Card."
Jean-Baptiste Queru [Thu, 9 Dec 2010 17:11:06 +0000 (09:11 -0800)]
merge from gingerbread
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
Wink Saville [Thu, 9 Dec 2010 05:53:24 +0000 (21:53 -0800)]
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
Wink Saville [Thu, 9 Dec 2010 05:37:38 +0000 (21:37 -0800)]
Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
Wink Saville [Wed, 8 Dec 2010 06:18:14 +0000 (22:18 -0800)]
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
Wink Saville [Wed, 8 Dec 2010 05:57:53 +0000 (21:57 -0800)]
Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:47:12 +0000 (12:47 -0800)]
resolved conflicts for merge of
78742e01 to stage-korg-master
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:01:25 +0000 (12:01 -0800)]
Merge "Strings for NI position request are moved to resources"
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:43:36 +0000 (13:43 -0800)]
am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:39:19 +0000 (13:39 -0800)]
Merge "Changing connect and response timeout."
Jean-Baptiste Queru [Mon, 6 Dec 2010 19:03:11 +0000 (11:03 -0800)]
am
864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '
864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
Jean-Baptiste Queru [Mon, 6 Dec 2010 18:57:04 +0000 (10:57 -0800)]
Merge "NumberPicker: Set formatter local value to US."
Jean-Baptiste Queru [Thu, 2 Dec 2010 23:16:53 +0000 (15:16 -0800)]
resolved conflicts for merge of
bf1439c5 to stage-korg-master
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
Jean-Baptiste Queru [Thu, 2 Dec 2010 22:56:13 +0000 (14:56 -0800)]
Merge "Preserve flags field of event passed to injectKeyEvent()"
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:55:02 +0000 (07:55 -0800)]
Merge from open-source master
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:54:49 +0000 (07:54 -0800)]
Merge from open-source master
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
Jean-Baptiste Queru [Wed, 1 Dec 2010 17:47:14 +0000 (09:47 -0800)]
Merge "Fix crash by "adb shell pm list permissions -f|-s""
Jean-Baptiste Queru [Wed, 1 Dec 2010 16:25:12 +0000 (08:25 -0800)]
Merge "Fix HTTP redirect missing statuscode 303 and 307"
Trevor Johns [Thu, 25 Nov 2010 00:23:47 +0000 (16:23 -0800)]
am
210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
* commit '
210e9c4a8b1fdbe9c409f9ce426907587430858a':
Revert "Disabling AccessibilityService sample from build system."
Trevor Johns [Thu, 25 Nov 2010 00:21:16 +0000 (16:21 -0800)]
Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
Xia Wang [Wed, 24 Nov 2010 21:29:56 +0000 (13:29 -0800)]
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
Xia Wang [Wed, 24 Nov 2010 21:27:53 +0000 (13:27 -0800)]
Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
Scott Main [Wed, 24 Nov 2010 20:43:08 +0000 (12:43 -0800)]
am
93116f8f: am
3577f51d: docs: clarify <include> layout properties bug:
3227820
* commit '
93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
docs: clarify <include> layout properties bug:
3227820
Scott Main [Wed, 24 Nov 2010 20:39:42 +0000 (12:39 -0800)]
am
3577f51d: docs: clarify <include> layout properties bug:
3227820
* commit '
3577f51d4bc236a11e283855337752a7b6897f8b':
docs: clarify <include> layout properties bug:
3227820
Jean-Baptiste Queru [Tue, 23 Nov 2010 19:14:57 +0000 (11:14 -0800)]
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
Jean-Baptiste Queru [Tue, 23 Nov 2010 19:02:09 +0000 (11:02 -0800)]
Merge "frameworks/base: Destroy the overlay even if there is an error"
Gloria Wang [Tue, 23 Nov 2010 05:26:13 +0000 (21:26 -0800)]
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
Gloria Wang [Tue, 23 Nov 2010 05:25:56 +0000 (21:25 -0800)]
am
d9334934: Merge "Update of DRM Framework."
* commit '
d93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
Gloria Wang [Tue, 23 Nov 2010 05:15:07 +0000 (21:15 -0800)]
Merge "Notify the playback status to DRM agents before the playback starts"
Gloria Wang [Tue, 23 Nov 2010 05:14:09 +0000 (21:14 -0800)]
Merge "Update of DRM Framework."
Jean-Baptiste Queru [Tue, 23 Nov 2010 00:32:34 +0000 (16:32 -0800)]
resolved conflicts for merge of
e4ae7fc3 to gingerbread-plus-aosp
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
Jean-Baptiste Queru [Mon, 22 Nov 2010 23:59:04 +0000 (15:59 -0800)]
Merge "Enabling cell broadcast (SMS-CB) support in the platform."
Xia Wang [Mon, 22 Nov 2010 22:46:33 +0000 (14:46 -0800)]
am
5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
* commit '
5df8c155872833647ac56951ab90bd26a9af9480':
Add Wifi Tethering stress test
Xia Wang [Mon, 22 Nov 2010 22:44:49 +0000 (14:44 -0800)]
Merge "Add Wifi Tethering stress test" into gingerbread
Naomi Luis [Thu, 18 Nov 2010 20:48:25 +0000 (12:48 -0800)]
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
Scott Main [Mon, 22 Nov 2010 21:55:55 +0000 (13:55 -0800)]
am
8fac7c2e: change sdk version variable to 2.3 (for docs)
* commit '
8fac7c2edc433b6c7d153caac238fef595133663':
change sdk version variable to 2.3 (for docs)
Jean-Baptiste Queru [Mon, 22 Nov 2010 21:44:56 +0000 (13:44 -0800)]
am
b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
* commit '
b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
Jean-Baptiste Queru [Mon, 22 Nov 2010 21:40:29 +0000 (13:40 -0800)]
Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
Dirk Dougherty [Sat, 20 Nov 2010 03:04:56 +0000 (19:04 -0800)]
am
805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
* commit '
805bddc123c1fc56be333d6ff365f168d4bc2b08':
doc change: Docs for SDK Tools r8, ADT 8
Dirk Dougherty [Sat, 20 Nov 2010 03:03:03 +0000 (19:03 -0800)]
Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
Wu-cheng Li [Sat, 20 Nov 2010 02:17:24 +0000 (18:17 -0800)]
am
589e8381: Merge "Improve camera documentation." into gingerbread
* commit '
589e838116b0dffa696fa39336d0588124877f98':
Improve camera documentation.
Wu-cheng Li [Sat, 20 Nov 2010 02:14:43 +0000 (18:14 -0800)]
Merge "Improve camera documentation." into gingerbread
Mathias Agopian [Sat, 20 Nov 2010 01:20:14 +0000 (17:20 -0800)]
am
927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
* commit '
927e7410000dd1917387c01fc4229836ddd5eb97':
Fix SensorManager.getOrientation() documentation.
Mathias Agopian [Sat, 20 Nov 2010 01:18:21 +0000 (17:18 -0800)]
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
Scott Main [Sat, 20 Nov 2010 00:51:57 +0000 (16:51 -0800)]
am
828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
* commit '
828b68166679ebfc0002e2ea516ca91e6fb13597':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462
Scott Main [Sat, 20 Nov 2010 00:48:50 +0000 (16:48 -0800)]
Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:21:31 +0000 (16:21 -0800)]
resolved conflicts for merge of
e2ec61b2 to gingerbread-plus-aosp
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:50:29 +0000 (15:50 -0800)]
Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files."
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:43:28 +0000 (15:43 -0800)]
am
e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
* commit '
e3bef7c48d7ec13cb8c7c81dba8d775377e69bed':
Added noop unregisterReceiver to complement existing noop registerReceiver.
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:31:30 +0000 (15:31 -0800)]
Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
Dirk Dougherty [Fri, 19 Nov 2010 18:53:20 +0000 (10:53 -0800)]
am
0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '
0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
Doc change: update media formats table.
Dirk Dougherty [Fri, 19 Nov 2010 18:47:10 +0000 (10:47 -0800)]
Merge "Doc change: update media formats table." into gingerbread
Brad Fitzpatrick [Fri, 19 Nov 2010 18:25:09 +0000 (10:25 -0800)]
am
251384a7: Merge "Improve performance when getting styled string."
* commit '
251384a7595022ddbc53f4ab0fa386f9c040f1f5':
Improve performance when getting styled string.