Jaikumar Ganesh
51e164ad73
Merge "Phone crash when old callback func is woken up when enabling BT."
2011-02-28 15:33:34 -08:00
Jean-Baptiste Queru
f9d33557e7
Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
2011-02-28 10:12:08 -08:00
Xavier Ducrohet
281cc9c8c0
Merge "Add --non-constant-id to aapt."
2011-02-24 15:59:26 -08:00
Wink Saville
e5ee1b5add
Merge "WAPPushManager, WAP Push over SMS message handler"
2011-02-23 17:40:43 -08:00
Mike Lockwood
d5372b93e9
Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence"
2011-02-23 16:27:27 -08:00
Brad Fitzpatrick
34bfec131d
Merge "Fixed GSM encoded network initiated position request"
2011-02-23 08:17:31 -08:00
Elliott Hughes
ddd5975296
Merge "Ensuring thread-safe usage of DateFormat."
2011-02-22 11:16:04 -08:00
Brad Fitzpatrick
a1ca28f78a
Merge "Fix for an infinite loop while scrolling lists."
2011-02-22 10:55:44 -08:00
Brad Fitzpatrick
55d0e988b0
Merge "Fixing infinite loop for zero duration."
2011-02-22 08:23:23 -08:00
Romain Guy
2151cef42c
Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
2011-02-17 22:40:33 -08:00
Jean-Baptiste Queru
3edab5a44e
Merge "stubs"
2011-02-11 09:39:46 -08:00
Steve Block
58c40337d0
stubs
...
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
2011-02-11 09:33:40 -08:00
Wink Saville
0db20b9d86
Merge "Telephony: Fix cb sms implementation"
2011-02-09 13:09:24 -08:00
Brad Fitzpatrick
d9d203315c
Merge "Fix a race condition in NativeDaemonConnector"
2011-02-07 09:55:34 -08:00
Dianne Hackborn
8fb929bcb1
Merge "Fixing possible race condition."
2011-02-06 09:06:35 -08:00
Kenny Root
9766fb35c8
Merge "JPtextinput: Dont break emoji characters when cutting strings."
2011-02-04 15:42:14 -08:00
Brad Fitzpatrick
ef22f460c6
Merge "Initialize resampling buffer per track."
2011-02-04 10:19:06 -08:00
Jean-Baptiste Queru
26ad216859
Merge from gingerbread
...
Change-Id: I6b895012db6b96666dc3257b1f2e430925981188
2011-02-03 14:25:38 -08:00
Jean-Baptiste Queru
81f81875bc
Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread
2011-02-03 14:02:59 -08:00
Jean-Baptiste Queru
9a0255c3c4
Merge from gingerbread
...
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
2011-02-03 13:17:49 -08:00
Jean-Baptiste Queru
05e90f057a
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
2011-02-03 12:17:47 -08:00
Jean-Baptiste Queru
12801c78e9
Merge from gingerbread
...
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
2011-02-02 09:47:43 -08:00
Jean-Baptiste Queru
5e06b988ab
Merge "fix for supporting 3 digits MNC code" into gingerbread
2011-02-02 09:44:16 -08:00
Jean-Baptiste Queru
32bfd0db82
Merge "Don't crash zygote if webcore fails to load"
2011-02-01 12:41:55 -08:00
Jean-Baptiste Queru
65881cf8b0
Merge "stubs"
2011-01-31 11:32:33 -08:00
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
8e543c60f5
stubs
...
Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
2011-01-29 06:19:37 -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
