29416 Commits

Author SHA1 Message Date
Jozef BABJAK
a8b9183a7c Fixing self-assignment in cloning code.
Change-Id: I6c918c0c7345678cbb171905eccfca50e59ae41a
2011-02-22 08:05:08 +01:00
Romain Guy
7118bdec52 Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 2011-02-17 22:40:33 -08:00
Michael Krehan
58e3822b59 Fix for #12945: ProgressBar.setMax() will always redraw.
Fix for issue #12945: Changing the maximum of a progress bar does
not cause it to be redrawn, even though a new maximum changes the
position of the current progress in relation to its maximum. With this fix,
setMax() will always cause refreshProgress() to be called if the maximum is
different than it was before.

Change-Id: I971ec3302953bcadc0aac3dd8241481bab2b5a91
2011-02-17 20:56:29 -08:00
Jean-Baptiste Queru
93552de8e3 Merge "stubs" 2011-02-11 09:39:46 -08:00
Steve Block
1da970625c stubs
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
2011-02-11 09:33:40 -08:00
Wink Saville
6e25789fbe Merge "Telephony: Fix cb sms implementation" 2011-02-09 13:09:24 -08:00
Alex Yakavenka
f7de51cc4d Telephony: Fix cb sms implementation
Change-Id: Ie2a678e3ab99f0d5b9dd68cc4a79e1c5a58ecbe2
2011-02-08 17:18:46 -08:00
Brad Fitzpatrick
9204644d9e Merge "Fix a race condition in NativeDaemonConnector" 2011-02-07 09:55:34 -08:00
anga
030bc88b4c Fix a race condition in NativeDaemonConnector
Fixes a race between the onDaemonConnected callback and setting the
mOutputStream in NativeDaemonConnector.

MountService connects to vold using the NativeDaemonConnector.
Throws a “NativeDaemonConnectorException: No output stream!”
when the onDaemonConnected callback in MountService calls the doListCommand.

Change-Id: Ib895bab37f7df680e4362df6366198c0a673c5e9
2011-02-07 09:53:59 -08:00
Dianne Hackborn
bb2e1ef87f Merge "Fixing possible race condition." 2011-02-06 09:06:35 -08:00
Kenny Root
c94a99987d Merge "JPtextinput: Dont break emoji characters when cutting strings." 2011-02-04 15:42:14 -08:00
Brad Fitzpatrick
b083d3b816 Merge "Initialize resampling buffer per track." 2011-02-04 10:19:06 -08:00
Yuuhi Yamaguchi
681d818523 Initialize resampling buffer per track.
When resampling too short sound, AudioMixer uses previous
tracks buffer. So we re-initialize the temporary buffer per
loop to avoid it.

Change-Id: I55a59a3b14faa8445e09c450478fe79cef704760
2011-02-04 15:24:34 +01:00
Jean-Baptiste Queru
db71bda6f6 Merge from gingerbread
Change-Id: I6b895012db6b96666dc3257b1f2e430925981188
2011-02-03 14:25:38 -08:00
Jean-Baptiste Queru
4ddd99090e Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread 2011-02-03 14:02:59 -08:00
Sang-Jun Park
b9ef00ea2f Fix the Multi-page SMS sending error to several receipents
Change-Id: Iefde94b638413e3c1761f17c3065b20a044e5958
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
2011-02-03 13:39:31 -08:00
Jean-Baptiste Queru
4b8ad9effd Merge from gingerbread
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
2011-02-03 13:17:49 -08:00
Jean-Baptiste Queru
2703b84caa Merge "Fix delivery report error with PENDING status in SMS" into gingerbread 2011-02-03 12:17:47 -08:00
Jean-Baptiste Queru
8226140cca Merge from gingerbread
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
2011-02-02 09:47:43 -08:00
Jean-Baptiste Queru
049b172b48 Merge "fix for supporting 3 digits MNC code" into gingerbread 2011-02-02 09:44:16 -08:00
Sang-Jun Park
ba34751426 fix for supporting 3 digits MNC code
Default Android MNC value has a 2 digit but it should be supported a 3 digit
MNC in India. (should be supported both 2 and 3 digits MNC)

Change-Id: I69373d196b29bccd06653841f24cbfe3886834fb
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
2011-02-02 19:12:31 +09:00
Jean-Baptiste Queru
eb17d6f51a Merge "Don't crash zygote if webcore fails to load" 2011-02-01 12:41:55 -08:00
Sang-Jun Park
c5996b9969 Fix delivery report error with PENDING status in SMS
1. According to TS 23.040, TP-Status values is changed properly.
2. When processing Status Report, it should be checked whether tpStatus is PENDING or FAILED.

Change-Id: I91c315cfb363f3e4b936c6b6b1a01083687a580f
2011-02-01 10:05:28 -08:00
Jozef BABJAK
06e57b5d46 Fixing possible race condition.
That return statement is effectively a reading of asynchronously modified
field. The reading and writing is elsewhere protected by locking on thread
instance, except this one occurence. Moving 'return' statement into
synchronized block ensures that it reads updated value.

Don't be afraid of deadlock - wait() releases the lock and acquires it
back when notified.

Change-Id: I940c24c04a1a2d4508d14d11b6174ff4fb2ab7d5
2011-02-01 08:53:52 +01:00
Jean-Baptiste Queru
c0e95048b9 Don't crash zygote if webcore fails to load
Change-Id: I88271fb62c0cc7c6d768009a713f20d9dfbfb5eb
2011-01-31 15:43:19 -08:00
Jean-Baptiste Queru
056340ac95 Merge "stubs" 2011-01-31 11:32:33 -08:00
Jean-Baptiste Queru
25503f1c9f Merge from gingerbread
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
2011-01-30 15:35:17 -08:00
Jean-Baptiste Queru
65aef1517b Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dianne Hackborn
25eb04642c Merge "Normalize output from aapt d" 2011-01-29 22:53:20 -08:00
Dianne Hackborn
bbb5a5ce19 Merge "Make AaptGroupEntry::getMncName accept mnc00" 2011-01-29 14:38:48 -08:00
Jean-Baptiste Queru
235ec8ad24 stubs
Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
2011-01-29 06:19:37 -08:00
Jean-Baptiste Queru
9720323a51 Merge "Delete browerplugin tests - do not merge" 2011-01-28 15:26:59 -08:00
Jean-Baptiste Queru
fca2f8bb6a Delete browerplugin tests - do not merge
Those don't build in all environments.

Change-Id: Ibeb8ac653f2961131d106864cc417c5ec58f2b36
2011-01-27 13:36:33 -08:00
Jeff Brown
7b448b8a6c Merge "Move keymaps from sdk/emulator/keymaps." 2011-01-26 14:25:08 -08:00
Ritu Srivastava
2d9299b39d 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
Jeff Brown
2786b312d3 Move keymaps from sdk/emulator/keymaps.
Change-Id: Ia10992a5988641b338cb4a50f57deadd5188a5e2
2011-01-25 19:08:04 -08:00
Brad Fitzpatrick
a206efcf8d Merge "android.os.Message: respect sPoolSize" 2011-01-25 15:12:18 -08:00
Brad Fitzpatrick
2405c278ef android.os.Message: respect sPoolSize
Also rename some static members from mFoo to sFoo.

Bug: http://code.google.com/p/android/issues/detail?id=13866
Change-Id: I5c5075eb6f529d1534c7aa72b6881873cd08676a
2011-01-25 14:54:31 -08:00
Brad Fitzpatrick
996de2dd41 Merge "Avoid using String.format in MediaRecorder" 2011-01-24 13:36:15 -08:00
Henrik Backlund
2450830c0c Avoid using String.format in MediaRecorder
String.format was used instead of a simple string concatenation.
This is a problem when language is set to Arabic since simple
integers will be converted into Arabic numbers.

Change-Id: I2cbd4c5cd2d09117202e6ae191845fd5fc9154ec
2011-01-24 17:55:46 +01:00
Dianne Hackborn
bcf2adeb10 Merge "aapt: Allow raw "%" in unformatted string-arrays" 2011-01-23 12:44:13 -08:00
Jeff Brown
265cf2e76b Merge "Fix getSwitchState." 2011-01-22 21:23:19 -08:00
Josh Stone
bf50322a24 aapt: Allow raw "%" in unformatted string-arrays
Commit 15fe2cb added format checking for translatable strings, enforcing
the use of positional args.  This check can be disabled on <string>
values with translatable="false" or formatted="false".  But they didn't
check for those attributes on <string-array>, so some of CM's strings
fail when they're not really format strings, just because they contain
percent signs.  (e.g. brightness widget's "Auto/Dim/40%/100%")

So now the formatted/translatable attributes are checked in string-array
too, and we can restore our proper percent signs.

Change-Id: I3478ab7e0b939e61fe0cec20201ac55096264080
2011-01-22 21:13:12 -08:00
Dianne Hackborn
35f4d32dc2 Merge "frameworks/base: Track owner in appropriate owners list of Uri" 2011-01-22 11:26:05 -08:00
Vairavan Srinivasan
91c12c27ef frameworks/base: Track owner in appropriate owners list of Uri
The owner isn't kept track it URI's writeOwners when
grantUriPermissionUncheckedLocked is invoked to provide both
read and write access to the URI. Fix is to check for both
read and write permissions and add owner to appropriate lists.

Change-Id: Id23688b96aefeb0a4911ee52ad47124bc5904fa0
2011-01-21 18:26:06 -08:00
Dianne Hackborn
a8069f34f6 Merge "Fixes Keyboard availability in "Providing Resources" documentation page." 2011-01-21 09:23:29 -08:00
Keiji Ariyama
a84e088211 Fixes Keyboard availability in "Providing Resources" documentation page.
Added keyshidden value.

Change-Id: I9fb1a06971488f446ccafdfa3b0db17786b33f97
2011-01-22 01:58:25 +09:00
Jeff Brown
3d822cda1e 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
069e810c6a Merge "Fixing memory leak in PreferenceScreen." 2011-01-18 13:23:13 -08:00
Brad Fitzpatrick
ded2b00643 Merge "frameworks/base: remove redundant code in WindowManager" 2011-01-18 12:59:19 -08:00