32269 Commits

Author SHA1 Message Date
Nick Kralevich
6c48f228f1 am 0cd28fdd: Merge "Use the default SecureRandom provider." into gingerbread
Merge commit '0cd28fdd16ac140d024953c7a076ffb3ec82c8b2' into gingerbread-plus-aosp

* commit '0cd28fdd16ac140d024953c7a076ffb3ec82c8b2':
  Use the default SecureRandom provider.
2010-09-24 13:16:19 -07:00
Dianne Hackborn
f123e49bf0 Some debugging support.
- New feature to "am monitor" to have it automatically launch
  gdbserv for you when a crash/ANR happens, and tell you how to
  run the client.

- Update dumpstate to match new location of binder debug logs

- Various commented out logs that are being used to track down
  issues.

Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
2010-09-24 13:11:55 -07:00
Nick Kralevich
0cd28fdd16 Merge "Use the default SecureRandom provider." into gingerbread 2010-09-24 13:10:42 -07:00
Eric Fischer
322ca29137 Import revised translations.
Change-Id: I41682cf0772a535f9925e134a3e87c3a00a214d1
2010-09-24 12:24:01 -07:00
Stephen Hines
9ba15e376b Merge "Adding support for dynamically updated test status" 2010-09-24 12:10:31 -07:00
Nick Kralevich
9bb4ec484b Use the default SecureRandom provider.
Don't be tricky when trying to set the seed for the secure
random number generator.  Setting the seed manually eliminates
the internal randomization the SecureRandom class does automatically,
reducing randomness.  Just use the default seed, which is designed
to be safe.

Change-Id: I5747c2b3a10cf04e33d2202195951ed5cb82b2fe
2010-09-24 11:48:37 -07:00
Patrick Scott
888bcdbeca am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp

* commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
  Add new Alarm provider class for setting an alarm.
2010-09-24 11:36:51 -07:00
Kenny Root
c55f6da728 am 0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
Merge commit '0b60626391ec840cc4a6d58ef77a2d029c2209dd' into gingerbread-plus-aosp

* commit '0b60626391ec840cc4a6d58ef77a2d029c2209dd':
  Revert "Revert "Free created FileMap when uncompressing files""
2010-09-24 11:36:46 -07:00
Kenny Root
3e07c0007b am 74865ef6: Merge "Add locking around ZIP seeking" into gingerbread
Merge commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9' into gingerbread-plus-aosp

* commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9':
  Add locking around ZIP seeking
2010-09-24 11:36:42 -07:00
Patrick Scott
3ae249dc6a Merge "Add new Alarm provider class for setting an alarm." into gingerbread 2010-09-24 11:34:10 -07:00
Kenny Root
0b60626391 Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread 2010-09-24 11:33:35 -07:00
Kenny Root
74865ef660 Merge "Add locking around ZIP seeking" into gingerbread 2010-09-24 11:33:29 -07:00
Eric Fischer
369b43a935 am f2af2d92: (-s ours) am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d'

* commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d':
  Import revised translations.  DO NOT MERGE
2010-09-24 11:25:47 -07:00
Andreas Huber
a1c7b096df am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
Merge commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp

* commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6':
  Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
2010-09-24 11:09:33 -07:00
Robert Greenwalt
2d457a32a6 am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp

* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
  Move long Connectivity tasks to handler thread.
2010-09-24 11:09:29 -07:00
Eric Fischer
f2af2d924d am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '4318ab058629b701e225bb7ead9dd2b229c9354b' into gingerbread-plus-aosp

* commit '4318ab058629b701e225bb7ead9dd2b229c9354b':
  Import revised translations.  DO NOT MERGE
2010-09-24 11:05:07 -07:00
James Dong
ed63f505ea Merge "Added two more video encoders" 2010-09-24 10:56:19 -07:00
Patrick Scott
a73c4b082c Add new Alarm provider class for setting an alarm.
The new class provides static variables for creating an intent to broadcast to
applications implementing the alarm clock.  A new permission has been added and
applications are recommended to require this permission if accepting the set
alarm broadcast.

Change-Id: I7b1014acdc54371cbda19bcf9b5c395b647aa413
2010-09-24 13:52:14 -04:00
Mike Lockwood
ab853b39be Merge "Add constant for SDCARD_RW group ID." 2010-09-24 10:45:38 -07:00
Andreas Huber
6d8fae722c Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread 2010-09-24 10:44:01 -07:00
Robert Greenwalt
8f97fe551e Merge "Move long Connectivity tasks to handler thread." into gingerbread 2010-09-24 10:42:46 -07:00
Eric Fischer
4318ab0586 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-24 10:37:04 -07:00
Eric Laurent
8fee382010 am 692dfafe: am 880dfe4f: Merge "Fix issue 3007862" into gingerbread
Merge commit '692dfafe02d04cdbab5367546e166580c92e4d2e'

* commit '692dfafe02d04cdbab5367546e166580c92e4d2e':
  Fix issue 3007862
2010-09-24 10:34:28 -07:00
Marco Nelissen
9362d3b3d2 Merge "Send album artist to the media provider again." 2010-09-24 10:27:36 -07:00
Eric Fischer
0e5467f51f Import revised translations. DO NOT MERGE
Change-Id: Iec41808d7f6514cffc67a91e1b243fa063f04089
2010-09-24 10:21:31 -07:00
Andreas Huber
3ac01190a7 Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
Change-Id: I67b287cf76546191f398939aabe4480d9e79a948
2010-09-24 10:09:00 -07:00
Eric Laurent
692dfafe02 am 880dfe4f: Merge "Fix issue 3007862" into gingerbread
Merge commit '880dfe4f675128188f8d598f2025a417ccabd1bf' into gingerbread-plus-aosp

* commit '880dfe4f675128188f8d598f2025a417ccabd1bf':
  Fix issue 3007862
2010-09-24 09:49:07 -07:00
Eric Laurent
880dfe4f67 Merge "Fix issue 3007862" into gingerbread 2010-09-24 09:43:24 -07:00
Alex Sakhartchouk
04b5dd4b04 Merge "Adding support for all allowed textures. Cleaning up unused code Adding error messages" 2010-09-24 09:42:47 -07:00
Eric Laurent
98c92599ac Fix issue 3007862
Removed a cross deadlock condition between audioflinger and audio policy
service mutexes.
Audioflinger::createEffect() locks audioflinger mutex and then calls
AudioSystem::getOutputForEffect() which ends up in
AudioPolicyService::getOutputForEffect() which locks audio policy service
mutex. If at the same time, the command thread in audio policy service is
processing a command(set volume, set route...), the mutex is locked and the
command will call one audioflinger method which in turn will attempt to
lock audioflinger mutex.
The fix consists in releasing audioflinger mutex before calling
getOutputForEffect().

Change-Id: Id44e7feb36e0a295731f6aa97cf32d022edd34d0
2010-09-24 09:32:40 -07:00
Vasu Nori
5a049b0fff temporarily comment out dbstats info code when doing adb bugreport
could this be causing bugs like bug:2990184

Change-Id: I315aaa93c1d71922ad4bc96ba0a14a9261a6f39a
2010-09-24 09:26:43 -07:00
Marco Nelissen
920d649949 Send album artist to the media provider again.
Change-Id: I13f44bab2024adcfbc4b9491ac565cfdf15ef9d9
2010-09-24 09:22:55 -07:00
Fabrice Di Meglio
8f57caf8ed Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
- force UTC timezone if recurrence is corresponding to an "allday" event

Change-Id: I3603438c0ad8019051ed4a8bd39d4aa7c0401eb1
2010-09-24 09:18:25 -07:00
Kenny Root
ba606d46f4 Revert "Revert "Free created FileMap when uncompressing files""
This revert reverts commit a19ef306bd0a257c67b50f5e0e669e9fe52b0889.
2010-09-24 09:11:28 -07:00
Andreas Huber
9aa1b24b41 am 19fe783d: am 37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread
Merge commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839'

* commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839':
  Proper sync-frame detection for sources that don't already provide it.
2010-09-24 08:38:04 -07:00
Hung-ying Tyan
3a4197e642 SipAudioCall: remove SipManager dependency.
Change-Id: I2dc8bf427e52f64529ee0e0261362b975a8917c6
2010-09-24 23:27:40 +08:00
Andreas Huber
19fe783d83 am 37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread
Merge commit '37155854b4d9ca405e5c41c4ab271006a4716193' into gingerbread-plus-aosp

* commit '37155854b4d9ca405e5c41c4ab271006a4716193':
  Proper sync-frame detection for sources that don't already provide it.
2010-09-24 08:27:33 -07:00
Andreas Huber
37155854b4 Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread 2010-09-24 08:17:20 -07:00
Kenny Root
6458fa0fce Add locking around ZIP seeking
Since we switched to seeking to the LFH to verify its existence instead
of a huge mmap of the file, we have to guarantee that another seek
doesn't happen before we finish our read on the LFH.

Change-Id: If8135d9cb6f2f5cc4db734eafa4f6b5f6269c62a
2010-09-24 08:05:51 -07:00
Mike Lockwood
58fd98accb Add constant for SDCARD_RW group ID.
Change-Id: I3b009cd06d3c1bc308ba82694db7383134709f75
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-24 11:02:47 -04:00
Steve Block
fe06c42b61 Merge "Remove superfluous Ahem.tff" 2010-09-24 03:32:14 -07:00
satok
407b82a8e0 am abdbb5c1: am 933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread
Merge commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d'

* commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d':
  Use MOTOYA font for Japanese font
2010-09-24 01:41:50 -07:00
satok
abdbb5c1e5 am 933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread
Merge commit '933fc94ce1ca4a1ead83dbc2a0f50f7324b28982' into gingerbread-plus-aosp

* commit '933fc94ce1ca4a1ead83dbc2a0f50f7324b28982':
  Use MOTOYA font for Japanese font
2010-09-24 01:37:39 -07:00
satok
933fc94ce1 Merge "Use MOTOYA font for Japanese font" into gingerbread 2010-09-24 01:33:23 -07:00
Hung-ying Tyan
a97c5f7779 Merge "fix build" 2010-09-23 23:24:35 -07:00
Hung-ying Tyan
fb0264096e fix build
Change-Id: Iff05b5ea7f535f532eec2af1edf78fdf8acfa21c
2010-09-24 14:23:31 +08:00
Chia-chi Yeh
50d9f32506 am 33460d83: am 658bec95: SDP: remove dead code.
Merge commit '33460d836fc2a062290d72ebcfb73af51ffa9c36'

* commit '33460d836fc2a062290d72ebcfb73af51ffa9c36':
  SDP: remove dead code.
2010-09-23 22:50:10 -07:00
Hung-ying Tyan
22a62d1342 resolved conflicts for merge of ee813bae to master
Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68
2010-09-24 13:45:43 +08:00
Mathias Agopian
2184624db1 am 4eb1ad5e: am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread
Merge commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e'

* commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e':
  better fix for [3028370] GL get error should return a valid error if no context is bound.
2010-09-23 21:41:30 -07:00
Steve Howard
04e79051dc am 56d60903: am a7bfe6ad: Support "seascape" rotation for "landscape-only" apps
Merge commit '56d6090380027efc7910537a2c2b99097ca36778'

* commit '56d6090380027efc7910537a2c2b99097ca36778':
  Support "seascape" rotation for "landscape-only" apps
2010-09-23 21:40:48 -07:00