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

23380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
e9bf8f289c am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 
Merge commit '4056ab97be6224dcc00ac70843544790f2d65fb7' into gingerbread-plus-aosp

* commit '4056ab97be6224dcc00ac70843544790f2d65fb7':
  Add permission requirements to SipAudioCall and SipManager javadoc.
 2010-10-20 14:03:54 -07:00
Hung-ying Tyan
a1d13cbc22 am 6037a056: Fix n-way conf call in SipPhone. 
Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp

* commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7':
  Fix n-way conf call in SipPhone.
 2010-10-20 14:03:43 -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
Justin Ho
121c22ed16 Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 2010-10-20 13:35:40 -07:00
Hung-ying Tyan
d33ad71a3c Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 2010-10-20 13:28:02 -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
Adam Powell
4c8c7da1f4 Merge "Add ActionBar tab callback method onTabReselected" 2010-10-19 17:58:20 -07:00
Scott Main
4777d13350 am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image 
Merge commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0' into gingerbread-plus-aosp

* commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
 2010-10-19 17:43:37 -07:00
Scott Main
5124451755 am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image 
Merge commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722' into gingerbread

* commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
 2010-10-19 17:29:29 -07:00
David Deephanphongs
45e47729a2 Add missing NOTICE entries. 
Add missing NOTICE block for TagSoup in general NOTICE file.
Add comment in Android.mk to help reviewers locate the NOTICE for apache-http.
Modify build rule for 'am' command to pull in the NOTICE file.

Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
 2010-10-19 16:56:02 -07:00
Dmitri Plotnikov
a09536398a Merge "Adding Insert.DATA extra for new/edit contact intents." 2010-10-19 15:49:25 -07:00
Jean-Baptiste Queru
82bedafd08 am db723ea0: Merge "jni: Remove duplicated jniThrowException()" 
Merge commit 'db723ea0f70392f712542edb1114fc15e782cdb7' into gingerbread-plus-aosp

* commit 'db723ea0f70392f712542edb1114fc15e782cdb7':
  jni: Remove duplicated jniThrowException()
 2010-10-19 15:22:13 -07:00
Mathias Agopian
141550bc18 fix [2236865] STOPSHIP: bump soft gl and egl minor version number 
Change-Id: Ibf46b18d7493348e189f2c93e969a6cac61f68b5
 2010-10-19 14:47:08 -07:00
Jean-Baptiste Queru
2387e907c4 Merge "jni: Remove duplicated jniThrowException()" 2010-10-19 14:42:52 -07:00
Gilles Debunne
11fd91e2f9 Merge "Renamed drawable-xlarge to drawable-mdpi-xlarge." 2010-10-19 14:27:13 -07:00
Gil Dobjanschi
76a03d8d4c Merge "Finalized the audio track ducking API" 2010-10-19 14:20:04 -07:00
Chung-yih Wang
343236b2f3 am 4944fdd7: Periodically scan wifi when wifi is not connected and wifi lock is grabbed in SipService. 
Merge commit '4944fdd771d2a629b3c1af8097df5eb2de02d9ee' into gingerbread-plus-aosp

* commit '4944fdd771d2a629b3c1af8097df5eb2de02d9ee':
  Periodically scan wifi when wifi is not connected and wifi lock is
 2010-10-19 14:17:44 -07:00
Hung-ying Tyan
d04bc8b1e1 am 0a6e717f: Handle dialing a SIP call to self. 
Merge commit '0a6e717fb6846f66b8dc853e079f2166307bfc60' into gingerbread-plus-aosp

* commit '0a6e717fb6846f66b8dc853e079f2166307bfc60':
  Handle dialing a SIP call to self.
 2010-10-19 14:14:15 -07:00
Chris Tate
8a28086378 Merge "Introduce an OnDragListener mechanism" 2010-10-19 13:58:07 -07:00
Brad Fitzpatrick
5a2d4572c9 am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'

* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 13:38:00 -07:00
Chris Tate
e123ef9a68 am a30c8835: (-s ours) am 18580319: DO NOT MERGE. Turn down backup logging for release. 
Merge commit 'a30c88359f62391b77874b83825a6e400c5100b3'

* commit 'a30c88359f62391b77874b83825a6e400c5100b3':
  DO NOT MERGE.  Turn down backup logging for release.
 2010-10-19 13:37:13 -07:00
Brad Fitzpatrick
8ccce0fdbc am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 
Merge commit '59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp

* commit '59993d9bc589089e6be55371c6536a42afe21a64':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
 2010-10-19 12:44:19 -07:00
Brad Fitzpatrick
59c4f35280 Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 2010-10-19 12:40:53 -07:00
Joe Onorato
ef156e6ab6 am bdf1706a: Merge "Reduce logging." into gingerbread 
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
 2010-10-19 12:29:43 -07:00
Brad Fitzpatrick
42b6a23ef3 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 12:25:46 -07:00
Joe Onorato
b99cc1dcf3 Merge "Reduce logging." into gingerbread 2010-10-19 12:23:51 -07:00
Brad Fitzpatrick
8e8732bfa9 Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 2010-10-19 12:12:31 -07:00
Joe Onorato
fc1a4df523 Reduce logging. 
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
 2010-10-19 15:08:05 -04:00