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

23384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
f6715ba6de am 6d90e89a: am a0795fc9: Merge "software renderer: fix [3117351] GL driver doesn\'t set the EGL_NATIVE_VISUAL_ID" into gingerbread 
Merge commit '6d90e89afa47293cf5fe18f512cce43d2fa6df82'

* commit '6d90e89afa47293cf5fe18f512cce43d2fa6df82':
  software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
 2010-10-21 13:47:59 -07:00
Jean-Baptiste Queru
d6d2886f08 am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp 
Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342'

* commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342':
  Make disabled TextViews uneditable
 2010-10-21 13:47:42 -07:00
Dianne Hackborn
a98b46e181 am 674b856c: am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 
Merge commit '674b856c15206a23d9d8a22fbd936a4f3055894d'

* commit '674b856c15206a23d9d8a22fbd936a4f3055894d':
  Fix java doc on FLAG_EXTERNAL.
 2010-10-21 13:47:08 -07:00
Jean-Baptiste Queru
f46ea1d2b4 am c20f205d: am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0" 
Merge commit 'c20f205d1059ff71b21d9c44ea147e209c364d2f'

* commit 'c20f205d1059ff71b21d9c44ea147e209c364d2f':
  BatteryService: Set bool to true if sysfs entry is not 0
 2010-10-21 13:46:41 -07:00
Jean-Baptiste Queru
42a9fb6105 am eceace47: am 81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 
Merge commit 'eceace47c575d15a3d4b7cd511c20f86850bf301'

* commit 'eceace47c575d15a3d4b7cd511c20f86850bf301':
  Fix FastScroller overlay position bug
 2010-10-21 13:46:24 -07:00
Kenny Root
1470a09b01 am c9259447: am ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread 
Merge commit 'c925944733207b83aaa81cf7a92c38eb48443470'

* commit 'c925944733207b83aaa81cf7a92c38eb48443470':
  Fix isUsbMassStorageConnected() will always return true
 2010-10-21 13:44:55 -07:00
Dianne Hackborn
cf6b318f2b am 153bf6c8: am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread 
Merge commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4'

* commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4':
  Fix issue #3113424: Battery stats don't reset on Crespo
 2010-10-21 13:44:47 -07:00
Justin Ho
d7b1c0c4b9 am a747b439: (-s ours) am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 
Merge commit 'a747b4399300beae712dacdf189f10e91b3623a0'

* commit 'a747b4399300beae712dacdf189f10e91b3623a0':
  DO NOT MERGE - Updated media playback transport controls (b/3116268)
 2010-10-21 13:44:16 -07:00
Hung-ying Tyan
5a6d2934c9 am bdc15d8b: am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 
Merge commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625'

* commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625':
  Add permission requirements to SipAudioCall and SipManager javadoc.
 2010-10-21 13:44:06 -07:00
Hung-ying Tyan
688fc1a102 am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone. 
Merge commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8'

* commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8':
  Fix n-way conf call in SipPhone.
 2010-10-21 13:43:43 -07:00
Chet Haase
5a2d8bd382 Merge "Optimizing display lists by referencing pointers to resources instead of copying them" 2010-10-21 13:29:26 -07:00
Daniel Sandler
351c1f60df Merge "New system bar "shirt pocket", for quickly stashing draggable bits." 2010-10-21 12:24:12 -07:00
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
Mathias Agopian
3f9f60fa42 am a0795fc9: Merge "software renderer: fix [3117351] GL driver doesn\'t set the EGL_NATIVE_VISUAL_ID" into gingerbread 
Merge commit 'a0795fc9bdf97703780cbf0ec47c06eccb642e72' into gingerbread-plus-aosp

* commit 'a0795fc9bdf97703780cbf0ec47c06eccb642e72':
  software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
 2010-10-20 18:22:17 -07:00
Jean-Baptiste Queru
e2fa4bc12c resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp 
Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d
 2010-10-20 18:16:57 -07:00
Mathias Agopian
6d44a8718a Merge "software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID" into gingerbread 2010-10-20 18:00:43 -07:00
Mathias Agopian
d8e5ceb963 software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID 
Change-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf
 2010-10-20 17:21:43 -07:00
Dianne Hackborn
034cf4281f am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 
Merge commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp

* commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
  Fix java doc on FLAG_EXTERNAL.
 2010-10-20 17:14:59 -07:00
Dianne Hackborn
b56d2f1a46 Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 2010-10-20 17:12:27 -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
Jean-Baptiste Queru
745d655cad Merge "Make disabled TextViews uneditable" 2010-10-20 16:46:52 -07:00
Jean-Baptiste Queru
121d99794e am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0" 
Merge commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04' into gingerbread-plus-aosp

* commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04':
  BatteryService: Set bool to true if sysfs entry is not 0
 2010-10-20 16:45:50 -07:00
Jean-Baptiste Queru
333874a009 Merge "BatteryService: Set bool to true if sysfs entry is not 0" 2010-10-20 16:35:17 -07:00
Jean-Baptiste Queru
fd9feaf384 am 81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 
Merge commit '81925e665c1e25d04cbc10e7333e793416bdc98f' into gingerbread-plus-aosp

* commit '81925e665c1e25d04cbc10e7333e793416bdc98f':
  Fix FastScroller overlay position bug
 2010-10-20 16:33:51 -07:00
Jean-Baptiste Queru
2be16c5ead Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 2010-10-20 16:29:15 -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
Kenny Root
3d9ee79ff9 am ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread 
Merge commit 'ddf8fe505636d3b4435cb9952266765aab20b86d' into gingerbread-plus-aosp

* commit 'ddf8fe505636d3b4435cb9952266765aab20b86d':
  Fix isUsbMassStorageConnected() will always return true
 2010-10-20 14:13:21 -07:00