Andreas Huber
16e3e00799
Merge "Remove development-only code." into gingerbread
2010-10-01 11:23:24 -07:00
Erik
b1ab6a8fff
Merge "b/3054044 Make allDay event times format in utc" into gingerbread
2010-10-01 11:08:13 -07:00
Andreas Huber
47ec74b31c
Merge "Squashed commit of the following:" into gingerbread
2010-10-01 11:01:33 -07:00
Dianne Hackborn
6381cf3b9d
Merge "Rub in a little 'ol log-b-gone." into gingerbread
2010-09-30 19:03:38 -07:00
Joe Onorato
f25ba29a5b
Merge "Use the private version of userActivity." into gingerbread
2010-09-30 18:12:24 -07:00
Kenny Root
eba1e0162a
Merge "Being already unmounted is not a failure" into gingerbread
2010-09-30 18:03:25 -07:00
Chia-chi Yeh
ded2f9d4c0
Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread
2010-09-30 17:41:09 -07:00
Eric Laurent
2a6277cfd9
Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
2010-09-30 17:39:36 -07:00
Hung-ying Tyan
9e03f93304
Merge "SipService: turn off verbose logging" into gingerbread
2010-09-30 17:20:25 -07:00
Steve Howard
77b23794f8
Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
2010-09-30 16:22:58 -07:00
Jake Hamby
514c70a790
Merge "Typo fixes in comments and minor code cleanups." into gingerbread
2010-09-30 15:47:34 -07:00
Jeff Brown
39e1275d2b
Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread
2010-09-30 15:46:00 -07:00
Eric Fischer
dd8fa072b0
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-09-30 15:44:54 -07:00
Jeff Brown
26c94ff615
Move verbose logging of device capabilities to dumpsys.
...
Change-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7
2010-09-30 15:34:48 -07:00
Kenny Root
9e681f5374
Merge "Fix location of gdbserver upon installation" into gingerbread
2010-09-30 14:27:15 -07:00
Mike Lockwood
33756f1947
Merge "location: rebind to network location and geocoder services after package update" into gingerbread
2010-09-30 13:07:06 -07:00
Dianne Hackborn
23beef51fd
Merge "Fix night/notnight resource folder handling." into gingerbread
2010-09-30 12:40:52 -07:00
Steve Howard
db6a8843ef
Merge "Have download manager give more details when downloads are paused" into gingerbread
2010-09-30 11:11:16 -07:00
Chia-chi Yeh
ae17a37d2d
KeyStore: Update the parameters of generating master keys.
...
To improve the security, the parameters to generate the master key has
been changed. Special cares has been taken to prevent from permanent
damages of the existing data during the transition process.
Change-Id: I0c93f3de28a9fcd314932675ccfb65a7f11fa3ff
2010-10-01 01:42:55 +08:00
Chia-chi Yeh
670a23f493
Merge "KeyStore: Initialize IV correctly." into gingerbread
2010-09-30 02:44:16 -07:00
Chia-chi Yeh
857edec1a2
KeyStore: Initialize IV correctly.
...
Change-Id: Idbf207dfcc11b92e606cbf4fd3732ed7a8aa3416
2010-09-30 17:28:01 +08:00
Chia-chi Yeh
18fc21daf5
Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread
2010-09-30 00:39:32 -07:00
Chia-chi Yeh
1c2eccfac3
KeyStore: Fix the return value when send() or recv() has an error.
...
Change-Id: I20a63c76bd29b1a9f8959a6c4fe5a5b8a9a971b4
2010-09-30 15:17:58 +08:00
Hung-ying Tyan
263ab1cd7d
Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
2010-09-30 00:05:58 -07:00
Chia-chi Yeh
ebbc6372b2
Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread
2010-09-29 23:24:32 -07:00
Adam Powell
a5e76f4d4b
Merge "Fix text anchors" into gingerbread
2010-09-29 21:05:12 -07:00
Robert Greenwalt
e88b133a3b
Merge "Change the 0_fully signal icon to the new style" into gingerbread
2010-09-29 19:48:57 -07:00
Jeff Brown
79d3af4a2f
Merge "PointerLocationView: Display orientation correctly." into gingerbread
2010-09-29 19:08:02 -07:00
Chia-chi Yeh
ba90c5ba8f
Merge "RTP: Enable AMR codec." into gingerbread
2010-09-29 18:32:24 -07:00
Hung-ying Tyan
bd3398c440
Merge "SIP: misc fixes." into gingerbread
2010-09-29 18:12:12 -07:00
Gilles Debunne
29d9af95e5
Merge "New assets for status bar data_edge and overscroll" into gingerbread
2010-09-29 17:05:26 -07:00
Ying Wang
11be2e62e2
Merge "Fix proguard flag file dependency." into gingerbread
2010-09-29 16:13:21 -07:00
Joe Onorato
e78c2bde02
Merge "AnimatedImageView: Stop the animation when we're not visible." into gingerbread
2010-09-29 14:25:15 -07:00
David Brown
b3df9fdb39
Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
2010-09-29 14:08:31 -07:00
Doug Zongker
8a6b6a4a4b
Merge "don't delete /cache/recovery/last_log on boot" into gingerbread
2010-09-29 13:41:00 -07:00
Jaikumar Ganesh
6ddcbd2167
Merge "Update local cache before sending intent." into gingerbread
2010-09-29 13:24:53 -07:00
Gilles Debunne
e84c62a323
Merge "New assets: wifi signal 1, no sim card." into gingerbread
2010-09-29 12:15:51 -07:00
Eric Fischer
c0e642476d
Merge "Split strings with SD card references into variations." into gingerbread
2010-09-29 12:14:10 -07:00
Chia-chi Yeh
2a7aea9d7e
Merge "RTP: Enable GSM-EFR codec." into gingerbread
2010-09-29 12:12:51 -07:00
Chia-chi Yeh
4c4d714225
Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
2010-09-29 11:50:16 -07:00
Joe Onorato
8a663231b1
Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
2010-09-29 11:00:14 -07:00
Roy West
89f7cfa16e
Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
2010-09-29 10:37:11 -07:00
Kenny Root
7b2f21e682
Merge "Move all the permissions check up for unmount" into gingerbread
2010-09-29 07:40:32 -07:00
Chia-chi Yeh
5be7524e14
Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
2010-09-28 21:11:27 -07:00
Mike Lockwood
a9bb401223
Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread
2010-09-28 20:15:55 -07:00
Chia-chi Yeh
e708b34802
Merge changes Iae1913fb,I38dbefef into gingerbread
...
* changes:
RTP: Enable GSM codec.
RTP: Refactor out G711 codecs into another file.
2010-09-28 19:40:59 -07:00
Dianne Hackborn
ef3021c20e
Merge "Remove old location classes." into gingerbread
2010-09-28 18:16:58 -07:00
Joe Onorato
12fac3a5c9
Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread
2010-09-28 17:19:37 -07:00
Joe Onorato
7d24892adf
Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread
2010-09-28 17:18:59 -07:00
Dianne Hackborn
254117d2f6
Merge "Add location shared library for location provider APIs." into gingerbread
2010-09-28 17:12:44 -07:00