ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,352 Commits 2 Branches 0 Tags 54 MiB
8ffb20a2cb
Commit Graph

23352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
8ffb20a2cb Merge "Don't remove items from mRecords while iterating over it." 2010-10-21 12:00:33 -07:00
Gilles Debunne
6ac6e7b18d Merge "Fix to display first tab as selected on tab widget creation." 2010-10-21 11:19:10 -07:00
Jeff Hamilton
9fac14b94e am e55806a5: am 23392a84: Fix the build. 
Merge commit 'e55806a55561c992086ddff717aca27206fa0c5d'

* commit 'e55806a55561c992086ddff717aca27206fa0c5d':
  Fix the build.
 2010-10-21 10:56:19 -07:00
Hung-ying Tyan
449d9e2979 am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails and... 
Merge commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e'

* commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e':
  Do another contact lookup if the first one fails and...
 2010-10-21 10:56:11 -07:00
Hung-ying Tyan
d19b510c39 am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 
Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d'

* commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d':
  Silently reject a ringing call when another call is dialing/ringing.
 2010-10-21 10:56:02 -07:00
Dianne Hackborn
41c6cc8af6 am b5018723: am 74b1ed32: Fix issue #3113219: NativeActivity using wrong lib path with Java code 
Merge commit 'b50187237c1bdbb805b67bbc35002b243b8a86fe'

* commit 'b50187237c1bdbb805b67bbc35002b243b8a86fe':
  Fix issue #3113219: NativeActivity using wrong lib path with Java code
 2010-10-21 10:55:52 -07:00
Hung-ying Tyan
5f771815d7 am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread 
Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82'

* commit '5102856947595cffc1cceb11b9e4c5baf70b2e82':
  Remove ringtone API from SipAudioCall.
 2010-10-21 10:55:33 -07:00
Dirk Dougherty
d59a6d9ff6 am 18cbc0e5: am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 
Merge commit '18cbc0e58a0e68411dff655f116a7010c3f464a2'

* commit '18cbc0e58a0e68411dff655f116a7010c3f464a2':
  Doc change: escape angle brackets in javadoc comment.
 2010-10-21 10:55:21 -07:00
Hung-ying Tyan
10e8c91316 am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread 
Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
  Return display name in SipConnection.getCnapName().
 2010-10-21 10:53:49 -07:00
Mathias Agopian
41e5645b1a am add9db83: am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread 
Merge commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5'

* commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
 2010-10-21 10:47:32 -07:00
Mindy Pereira
e01f9004a2 am 62ad0db6: (-s ours) am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Merge commit '62ad0db62393073a8cda9b21e4ae1506954c10a5'

* commit '62ad0db62393073a8cda9b21e4ae1506954c10a5':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
 2010-10-21 10:47:15 -07:00
Scott Main
4e5effe0f1 am b619e333: am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image 
Merge commit 'b619e3332d36a8b5c56da6530834be8cc69272df'

* commit 'b619e3332d36a8b5c56da6530834be8cc69272df':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
 2010-10-21 09:56:04 -07:00
Jean-Baptiste Queru
ab28d9e43b am 2cead908: am db723ea0: Merge "jni: Remove duplicated jniThrowException()" 
Merge commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102'

* commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102':
  jni: Remove duplicated jniThrowException()
 2010-10-21 09:54:58 -07:00
Chung-yih Wang
58daba3083 am aefcdde4: am 4944fdd7: Periodically scan wifi when wifi is not connected and wifi lock is grabbed in SipService. 
Merge commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6'

* commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6':
  Periodically scan wifi when wifi is not connected and wifi lock is
 2010-10-21 09:51:01 -07:00
Hung-ying Tyan
653b5e25b5 am 35d9e770: am 0a6e717f: Handle dialing a SIP call to self. 
Merge commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2'

* commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2':
  Handle dialing a SIP call to self.
 2010-10-21 09:50:50 -07:00
Brad Fitzpatrick
2e6dd6150e am 6799864d: am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 
Merge commit '6799864d6c9744e4c5133a90410576b577d65de6'

* commit '6799864d6c9744e4c5133a90410576b577d65de6':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
 2010-10-21 09:47:27 -07:00
Brad Fitzpatrick
c6a98bb73d resolved conflicts for merge of 368fdba4 to master 
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
 2010-10-21 07:39:10 -07:00
Chris Tate
e0435c2156 Merge "Fix obtain() when the pool is still empty" 2010-10-20 19:04:34 -07:00
Brad Fitzpatrick
e22d21412f Revert "Add length-equality test in String operator== checks." 
This reverts commit e28210d401ae4ed1258b84c9b17a172a757190e8.
 2010-10-20 17:06:28 -07:00
Jamie Gennis
ed287f4d39 Merge "Fix the non-ANW video decode path." 2010-10-20 16:04:12 -07:00
Wink Saville
150e13c4db Merge "Add AsyncChannel and AsyncService." 2010-10-20 15:51:23 -07:00
Brad Fitzpatrick
2eabb00979 Merge "Add length-equality test in String operator== checks." 2010-10-20 15:47:04 -07:00
Andreas Huber
e16a518265 Merge "If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset()." 2010-10-20 15:13:09 -07:00
Andreas Huber
58ce2068de Merge "Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF." 2010-10-20 15:11:02 -07:00
Brad Fitzpatrick
075e750330 Add length-equality test in String operator== checks. 
Change-Id: I6ebc6ef85aac4539269f137c1f29f95b9828d4f9
 2010-10-20 15:03:49 -07:00
Andreas Huber
9b303b9d72 Merge "Make sure we can encode the size of the codec specific data in a single byte." 2010-10-20 14:33:06 -07:00
Jeff Hamilton
97d3435086 am 23392a84: Fix the build. 
Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp

* commit '23392a84bcb961d3fd50142ec40ce6ac6db89018':
  Fix the build.
 2010-10-20 13:57:26 -07:00
Hung-ying Tyan
f38409d27e am 6fe795ec: Do another contact lookup if the first one fails and... 
Merge commit '6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp

* commit '6fe795ecd35c4d49822d349424fc71b660577dfc':
  Do another contact lookup if the first one fails and...
 2010-10-20 13:57:20 -07:00
Hung-ying Tyan
31251614b9 am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 
Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp

* commit 'baced375ba5f374445c44a2115700d69693794a0':
  Silently reject a ringing call when another call is dialing/ringing.
 2010-10-20 13:56:59 -07:00
Dianne Hackborn
3124721b39 am 74b1ed32: Fix issue #3113219: NativeActivity using wrong lib path with Java code 
Merge commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004' into gingerbread-plus-aosp

* commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004':
  Fix issue #3113219: NativeActivity using wrong lib path with Java code
 2010-10-20 13:56:03 -07:00
Hung-ying Tyan
91459a151f am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread 
Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp

* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
  Remove ringtone API from SipAudioCall.
 2010-10-20 13:54:25 -07:00
Dirk Dougherty
4272310f5f am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 
Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp

* commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de':
  Doc change: escape angle brackets in javadoc comment.
 2010-10-20 13:54:09 -07:00
James Dong
fcbcaa8159 Merge "Fix an issue where the video size was incorrectly retrieved from preview size" 2010-10-20 13:48:14 -07:00
Vasu Nori
0c5c40ede3 Merge "remove duplicate code" 2010-10-20 13:46:19 -07:00
Hung-ying Tyan
a648451945 Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 2010-10-20 11:49:26 -07:00
Jamie Gennis
c86ff48492 Merge "Add decode-to-ANativeWindow support to Stagefright." 2010-10-20 11:38:28 -07:00
Ben Murdoch
e556862a50 Merge "Set the unique id of the AutoFill profile WebKit can read it" 2010-10-20 11:35:47 -07:00
Hung-ying Tyan
2a9c6d0913 Merge "Remove ringtone API from SipAudioCall." into gingerbread 2010-10-20 09:47:45 -07:00
Dirk Dougherty
bcb743a1f5 Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 2010-10-20 09:34:24 -07:00
Ben Murdoch
94b2427e42 Merge "Implement file downloads for Chrome HTTP stack (Java side)" 2010-10-20 08:36:17 -07:00
Leon Scroggins
e9b77acc54 Merge "Use primary color for matches string." 2010-10-20 06:46:48 -07:00
Jack Wang
3cbd4da6df Merge "Added RepetitiveTest annotation and test runner support" 2010-10-20 03:23:49 -07:00
James Dong
078f5cc434 Merge "Make camera source ready for handling meta-data video buffers." 2010-10-19 23:54:57 -07:00
James Dong
e92794571f Merge "Camera framework change required for 0-memcpy recording" 2010-10-19 23:54:38 -07:00
Hung-ying Tyan
c1820600b3 am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread 
Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp

* commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
  Return display name in SipConnection.getCnapName().
 2010-10-19 23:03:25 -07:00
Hung-ying Tyan
89b8c939c4 Merge "Return display name in SipConnection.getCnapName()." into gingerbread 2010-10-19 23:00:16 -07:00
Mathias Agopian
309be7131f am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread 
Merge commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp

* commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
 2010-10-19 18:26:28 -07:00
Mathias Agopian
1aedd5613e Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread 2010-10-19 18:23:19 -07:00
Mindy Pereira
2758ba9e70 am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp

* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
 2010-10-19 18:23:18 -07:00
Patrick Dubroy
550bba75ab Merge "Fix memory leak with TouchTargets not being recycled." 2010-10-19 18:03:46 -07:00