Gilles Debunne
a27ddfdc79
am ed1cf3da: am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread
...
Merge commit 'ed1cf3dab59d7af51240269308007546a816b1f4'
* commit 'ed1cf3dab59d7af51240269308007546a816b1f4':
New assets: wifi signal 1, no sim card.
2010-09-30 11:00:19 -07:00
Eric Fischer
dfd634da88
am 97708b19: am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread
...
Merge commit '97708b19c564294182558d757a871abc892d6975'
* commit '97708b19c564294182558d757a871abc892d6975':
Split strings with SD card references into variations.
2010-09-30 11:00:01 -07:00
Chia-chi Yeh
444b6efd94
am 1c2eab2d: am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread
...
Merge commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57'
* commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57':
RTP: Enable GSM-EFR codec.
2010-09-30 10:59:48 -07:00
Stephen Hines
e6622bc63f
Merge "Fix clear() operation for rsScriptC."
2010-09-30 10:57:17 -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
5b0de90f96
am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread
...
Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp
* commit '20cb2310cffb787c54016d50b9b5fe320fc5b025':
KeyStore: Initialize IV correctly.
2010-09-30 10:11:16 -07:00
Chia-chi Yeh
06d4a936de
am 21ae1ad6: RTP: Minor fixes with polishing.
...
Merge commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3' into gingerbread-plus-aosp
* commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3':
RTP: Minor fixes with polishing.
2010-09-30 10:11:07 -07:00
Chia-chi Yeh
f3e1e2b617
am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread
...
Merge commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01' into gingerbread-plus-aosp
* commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01':
KeyStore: Fix the return value when send() or recv() has an error.
2010-09-30 10:10:59 -07:00
Hung-ying Tyan
eced15c440
am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread
...
Merge commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6' into gingerbread-plus-aosp
* commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6':
Add uri field to SipManager.ListenerRelay
2010-09-30 10:10:52 -07:00
Chia-chi Yeh
52dd08bb76
am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread
...
Merge commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720' into gingerbread-plus-aosp
* commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720':
RTP: Adjust the jitter buffer to 512ms.
2010-09-30 10:10:46 -07:00
Hung-ying Tyan
726d8d503b
am 6a53489a: SipService: add UID check.
...
Merge commit '6a53489ae594d7cc373a00687d6ea2f23d0634df' into gingerbread-plus-aosp
* commit '6a53489ae594d7cc373a00687d6ea2f23d0634df':
SipService: add UID check.
2010-09-30 10:10:41 -07:00
Adam Powell
f9f60b3866
am bc87ada1: Merge "Fix text anchors" into gingerbread
...
Merge commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120' into gingerbread-plus-aosp
* commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120':
Fix text anchors
2010-09-30 10:10:34 -07:00
Jeff Brown
71e6917bbc
am 5068ad8d: Revert orientation change.
...
Merge commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9' into gingerbread-plus-aosp
* commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9':
Revert orientation change.
2010-09-30 10:10:20 -07:00
Robert Greenwalt
6735e36252
am e8dd7160: Merge "Change the 0_fully signal icon to the new style" into gingerbread
...
Merge commit 'e8dd7160146803db6660fa10ab3e4f1d41e46c5b' into gingerbread-plus-aosp
* commit 'e8dd7160146803db6660fa10ab3e4f1d41e46c5b':
Change the 0_fully signal icon to the new style
2010-09-30 10:10:14 -07:00
Jeff Brown
e16bb02a38
am 93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread
...
Merge commit '93e3296f946bf54e0f8172c9d26355d9a65c878f' into gingerbread-plus-aosp
* commit '93e3296f946bf54e0f8172c9d26355d9a65c878f':
PointerLocationView: Display orientation correctly.
2010-09-30 10:10:09 -07:00
Chia-chi Yeh
4dca7ba98a
am 0a537b78: Merge "RTP: Enable AMR codec." into gingerbread
...
Merge commit '0a537b78d3fb4db86411d745b2696459d6b98ef6' into gingerbread-plus-aosp
* commit '0a537b78d3fb4db86411d745b2696459d6b98ef6':
RTP: Enable AMR codec.
2010-09-30 10:10:02 -07:00
Hung-ying Tyan
dbe52c0a08
am 2365b78e: Merge "SIP: misc fixes." into gingerbread
...
Merge commit '2365b78e64feaa9527efb15bf4ac207a837f2b45' into gingerbread-plus-aosp
* commit '2365b78e64feaa9527efb15bf4ac207a837f2b45':
SIP: misc fixes.
2010-09-30 10:09:53 -07:00
Hung-ying Tyan
45c9dae7f0
am 0e412304: Catch exceptions in SipPhone.canTake().
...
Merge commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44' into gingerbread-plus-aosp
* commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44':
Catch exceptions in SipPhone.canTake().
2010-09-30 10:09:39 -07:00
Hung-ying Tyan
3d9bb61170
am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection.
...
Merge commit '421c34c162098efe870574844a7ee49812bbb929' into gingerbread-plus-aosp
* commit '421c34c162098efe870574844a7ee49812bbb929':
SipPhone: revise hangup() in SipCall and SipConnection.
2010-09-30 10:09:33 -07:00
Gilles Debunne
3a716dfd06
am 71e24862: Merge "New assets for status bar data_edge and overscroll" into gingerbread
...
Merge commit '71e2486209856d33d027389be2bd4924a03c4f86' into gingerbread-plus-aosp
* commit '71e2486209856d33d027389be2bd4924a03c4f86':
New assets for status bar data_edge and overscroll
2010-09-30 10:08:38 -07:00
Ying Wang
2aa9489fea
am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread
...
Merge commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93' into gingerbread-plus-aosp
* commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93':
Fix proguard flag file dependency.
2010-09-30 09:33:19 -07: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
Owen Lin
87fe54e7e8
Merge "Fix a initialization bug in BitmapRegionDecoder."
2010-09-29 22:57:08 -07:00
Chia-chi Yeh
27dd99b46a
am 1254b9c5: am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
...
Merge commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d'
* commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d':
RTP: Revise the workaround of private addresses and fix bugs.
2010-09-29 22:13:44 -07:00
Joe Onorato
d4a1956aec
am 198297b4: am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread
...
Merge commit '198297b495d975cd4889f5136cd69368bd319eed'
* commit '198297b495d975cd4889f5136cd69368bd319eed':
Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
2010-09-29 22:13:21 -07:00
Roy West
3382fbfea4
am b4a28f24: (-s ours) am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
...
Merge commit 'b4a28f24263fbccce4b77b47c2f3ddac63a8a75f'
* commit 'b4a28f24263fbccce4b77b47c2f3ddac63a8a75f':
Partial fix to bug 2992589: Edit dev admin strings.
2010-09-29 22:12:19 -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
Gil Dobjanschi
7dc969e8b9
Merge "Added ability to instantiate various implementations of the VideoEditor"
2010-09-29 19:47:38 -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
Winson Chung
7cfa5d5368
Merge "Fixing issue where notifyDataSetChanged was not properly being called while not loading items."
2010-09-29 18:03:07 -07:00
Kenny Root
4f564d7d34
am 8bd545ab: am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
...
Merge commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c'
* commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c':
Move all the permissions check up for unmount
2010-09-29 17:17:22 -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
Mathias Agopian
74c40c0a27
refactored screenshot code
...
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.
we also now have some client code to interface with the screenshot service.
it's now possible to request a screenshot at a lower resolution.
Change-Id: I5a3b0e431421800e3aad601d9af8f94adffbc71f
2010-09-29 16:55:15 -07:00
Ying Wang
11be2e62e2
Merge "Fix proguard flag file dependency." into gingerbread
2010-09-29 16:13:21 -07:00
Alex Sakhartchouk
41fca340ab
Merge "More robust attribute binding Adding attribute and uniform debug logging. Checking to see if aniso filtering is available."
2010-09-29 15:48:51 -07:00
Joe Onorato
0046c53725
am 2a0b3c0d: Merge "AnimatedImageView: Stop the animation when we\'re not visible." into gingerbread
...
Merge commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5' into gingerbread-plus-aosp
* commit '2a0b3c0d4cd98385ebfa60cc2014bdb2d7b5a7f5':
AnimatedImageView: Stop the animation when we're not visible.
2010-09-29 14:28:03 -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
eeb9a9af5c
am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
...
Merge commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b' into gingerbread-plus-aosp
* commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b':
Implement contacts lookup (caller-id) for incoming SIP calls.
2010-09-29 14:10:37 -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
16f1ddba0f
am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
...
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp
* commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4':
don't delete /cache/recovery/last_log on boot
2010-09-29 13:43:28 -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
Romain Guy
e0d26fbac8
Merge "Add display lists caching."
2010-09-29 13:37:37 -07:00