ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,787 Commits 2 Branches 0 Tags 54 MiB
2a877ed73a
Commit Graph

18787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jaikumar Ganesh
c2a23c1a04 am a5c742bf: Merge "Update local cache before sending intent." into gingerbread 
Merge commit 'a5c742bfd08df55849418cd1c77065ac54d83502' into gingerbread-plus-aosp

* commit 'a5c742bfd08df55849418cd1c77065ac54d83502':
  Update local cache before sending intent.
 2010-09-29 13:27:38 -07:00
Jaikumar Ganesh
6ddcbd2167 Merge "Update local cache before sending intent." into gingerbread 2010-09-29 13:24:53 -07:00
Gilles Debunne
cd6b57c915 am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread 
Merge commit 'f0fa267492353a98562d32d4359f2099df0f2fcd' into gingerbread-plus-aosp

* commit 'f0fa267492353a98562d32d4359f2099df0f2fcd':
  New assets: wifi signal 1, no sim card.
 2010-09-29 12:20:31 -07:00
Eric Fischer
10276a4b47 am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread 
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp

* commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0':
  Split strings with SD card references into variations.
 2010-09-29 12:17:28 -07:00
Chia-chi Yeh
6acfce816d am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread 
Merge commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c' into gingerbread-plus-aosp

* commit '955ab37cee3b2c61e67a2f8ceca895b47f6a182c':
  RTP: Enable GSM-EFR codec.
 2010-09-29 12:17:24 -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
b5327a4ac0 am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread 
Merge commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004' into gingerbread-plus-aosp

* commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004':
  RTP: Revise the workaround of private addresses and fix bugs.
 2010-09-29 11:53:07 -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
b93f6bad12 am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread 
Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp

* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
 2010-09-29 11:02:55 -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
fb46cd118b am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp

* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
  Partial fix to bug 2992589: Edit dev admin strings.
 2010-09-29 10:40:06 -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
c3bc834a00 am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread 
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp

* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
  Move all the permissions check up for unmount
 2010-09-29 07:53:06 -07:00
Kenny Root
7b2f21e682 Merge "Move all the permissions check up for unmount" into gingerbread 2010-09-29 07:40:32 -07:00
Nick Pelly
6f76708405 am 038cabe0: NFC integration 
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
 2010-09-28 22:40:18 -07:00
Chia-chi Yeh
83c3741a90 am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 
Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp

* commit 'd6877fa4971710150de20453bf4ba54dca863429':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
 2010-09-28 21:13:54 -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
6f4ae27e33 am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread 
Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp

* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
  Revert "Check for the DEVICE_POWER permission in userActivity."
 2010-09-28 20:18:36 -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
90d2e41eef am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread 
Merge commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1' into gingerbread-plus-aosp

* commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1':
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
 2010-09-28 19:43:50 -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
7812878c68 am 3e94b94f: Merge "Remove old location classes." into gingerbread 
Merge commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3' into gingerbread-plus-aosp

* commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3':
  Remove old location classes.
 2010-09-28 18:20:26 -07:00
Dianne Hackborn
ef3021c20e Merge "Remove old location classes." into gingerbread 2010-09-28 18:16:58 -07:00