Commit Graph

19861 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
9a73eb378f Merge from gingerbread
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
2011-01-30 15:35:17 -08:00
Jean-Baptiste Queru
9b1515590c Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dianne Hackborn
73431999ab Merge "Normalize output from aapt d" 2011-01-29 22:53:20 -08:00
Dianne Hackborn
141ef82df3 Merge "Make AaptGroupEntry::getMncName accept mnc00" 2011-01-29 14:38:48 -08:00
Jean-Baptiste Queru
b573eb4453 Merge "Delete browerplugin tests - do not merge" 2011-01-28 15:26:59 -08:00
Jeff Brown
e8fecc4f7f Merge "Move keymaps from sdk/emulator/keymaps." 2011-01-26 14:25:08 -08:00
Ritu Srivastava
5ee1a0c5ee 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>
2011-01-25 21:48:54 -08:00
Brad Fitzpatrick
fed2f18022 Merge "android.os.Message: respect sPoolSize" 2011-01-25 15:12:18 -08:00
Brad Fitzpatrick
43c79a0317 Merge "Avoid using String.format in MediaRecorder" 2011-01-24 13:36:15 -08:00
Dianne Hackborn
5ab218b1d3 Merge "aapt: Allow raw "%" in unformatted string-arrays" 2011-01-23 12:44:13 -08:00
Jeff Brown
f079d0d3f9 Merge "Fix getSwitchState." 2011-01-22 21:23:19 -08:00
Dianne Hackborn
c315da09e8 Merge "frameworks/base: Track owner in appropriate owners list of Uri" 2011-01-22 11:26:05 -08:00
Dianne Hackborn
e0070aae48 Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 2011-01-21 09:23:29 -08:00
Jeff Brown
cb203b228b 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
2011-01-19 20:35:47 -08:00
Brad Fitzpatrick
49d6c75c2f Merge "Fixing memory leak in PreferenceScreen." 2011-01-18 13:23:13 -08:00
Brad Fitzpatrick
e3cbb9d638 Merge "frameworks/base: remove redundant code in WindowManager" 2011-01-18 12:59:19 -08:00
Dianne Hackborn
05186bbe9f Merge "Don't drop the drawable cache completely on configuration change" 2011-01-14 15:37:56 -08:00
Dianne Hackborn
e0aa3e5dd6 Merge "Make the Phone options dialog use current language" 2011-01-14 15:36:58 -08:00
Dianne Hackborn
2e68f7e7ef Merge "Added check to make orientation calculations more robust" 2011-01-14 15:36:52 -08:00
Gloria Wang
afa4049617 Merge "Initial OMA DRM forward lock contribution" 2011-01-13 10:51:13 -08:00
Brad Fitzpatrick
421951a1df Merge "Fix for crash when setting live wallpaper." 2011-01-12 15:45:05 -08:00
Brad Fitzpatrick
5690f917fa Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore" 2011-01-10 08:02:03 -08:00
Romain Guy
08b4007d23 Merge "Typo in Javadoc" 2011-01-08 10:04:32 -08:00
Gloria Wang
988b1a4cf1 Merge "DRM Framework bug fixes." 2011-01-07 11:10:49 -08:00
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
Shachar Shemesh
ca6fca93fc 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
2011-01-04 20:52:08 +02: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