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
Eric Laurent
8b810064c2
Merge "Fix several audio effects problems." into gingerbread
2010-09-28 16:38:22 -07:00
Ying Wang
cb736594bb
Merge "Call functions to calculate deps and classes.jar" into gingerbread
2010-09-28 15:06:10 -07:00
Chia-chi Yeh
7e70f6df88
Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread
2010-09-28 14:41:18 -07:00
Jeff Brown
adf739abc4
Merge "Fix bug in split touches." into gingerbread
2010-09-28 13:27:37 -07:00
Jeff Brown
1c32258443
Fix bug in split touches.
...
Change-Id: I808c2201a06938f82817058059f4ddcc9b1a9ae2
2010-09-28 13:26:42 -07:00
Andreas Huber
a29b78b612
Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread
2010-09-28 13:23:26 -07:00
Hung-ying Tyan
ce6a06d54e
Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread
2010-09-28 13:00:38 -07:00
Gilles Debunne
3ff47bdcf9
Merge "New assets. DO NOT MERGE>" into gingerbread
2010-09-28 12:56:54 -07:00
jsh
68f2073783
Merge "Add line break between PLMN and SPN in windowshade." into gingerbread
2010-09-28 12:44:47 -07:00
Steve Howard
1277bed788
Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
2010-09-28 12:38:15 -07:00
Andreas Huber
f3b1fab582
Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread
2010-09-28 12:02:35 -07:00
Andreas Huber
8a5b141433
Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread
2010-09-28 11:46:41 -07:00
Andreas Huber
e8d14e3a9f
Merge "Squashed commit of the following:" into gingerbread
2010-09-28 11:27:33 -07:00
Dianne Hackborn
e640c7bb94
Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread
2010-09-28 11:21:27 -07:00
Andy Stadler
a31234bb9f
Merge "Allow touch events when clickable *or* longClickable" into gingerbread
2010-09-28 09:26:49 -07:00
Dave Sparks
b4a76a3249
Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well." into gingerbread
2010-09-28 08:44:39 -07:00
Jeff Brown
ced8172ac1
Merge "Fix pointer index when splitting secondary pointers." into gingerbread
2010-09-27 20:57:02 -07:00
Jeff Brown
ffb16d601b
Fix pointer index when splitting secondary pointers.
...
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
2010-09-27 20:54:28 -07:00