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

23563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
2a734d952c am c0e93a84: am 7ea5c45e: NFC settings cleanup. 
Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a'

* commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a':
  NFC settings cleanup.
 2010-10-21 13:50:09 -07:00
Brad Fitzpatrick
8112eeee4f am 0c551368: am 15358e14: Merge "Make the base direction of the Arabic error pages RTL" 
Merge commit '0c55136893849d72ac267f887a841efe845218a1'

* commit '0c55136893849d72ac267f887a841efe845218a1':
  Make the base direction of the Arabic error pages RTL
 2010-10-21 13:49:41 -07:00
Brad Fitzpatrick
573a08bb65 am ba1b1c9c: am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL" 
Merge commit 'ba1b1c9c22373737b1ba50a6847b1fbe33999179'

* commit 'ba1b1c9c22373737b1ba50a6847b1fbe33999179':
  Set the base direction of the Hebrew error pages to RTL
 2010-10-21 13:49:35 -07:00
James Dong
ee29fef233 am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread 
Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99'

* commit '8ad6335d2c22900de5b46460473495b5bcea9f99':
  File writer size estimation improvement
 2010-10-21 13:49:00 -07:00
Mathias Agopian
e3c5974719 am 63ac8f53: am 2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread 
Merge commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea'

* commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea':
  Add a test application to dump all the EGLConfig available
 2010-10-21 13:48:50 -07:00
Mathias Agopian
3abb297690 am 4ceee5a6: (-s ours) am 73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread 
Merge commit '4ceee5a6b0089ffbec75690b7284f80d481ab212'

* commit '4ceee5a6b0089ffbec75690b7284f80d481ab212':
  propagate RS context priority to EGLContext when possible. DO NOT MERGE.
 2010-10-21 13:48:42 -07:00
Mathias Agopian
47a79466a7 am fb31036f: am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread 
Merge commit 'fb31036fd844444c395a2ae9c97439eec9f774e4'

* commit 'fb31036fd844444c395a2ae9c97439eec9f774e4':
  Use the context_priority extension when present.
 2010-10-21 13:48:36 -07:00
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
Chia-chi Yeh
82a3307a06 am 703aae06: Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread 
Merge commit '703aae06c0925b19657877bb1872bb2f28874969' into gingerbread-plus-aosp

* commit '703aae06c0925b19657877bb1872bb2f28874969':
  RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.
 2010-10-21 12:57:03 -07:00
Chia-chi Yeh
e739a5257d Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread 2010-10-21 12:53:37 -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
Nick Kralevich
aa514a1570 am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread 
Merge commit '62d0970c82f9a2c17aea67379c207a3f17556c46' into gingerbread-plus-aosp

* commit '62d0970c82f9a2c17aea67379c207a3f17556c46':
  allow dumpstate to work for non-root users.
 2010-10-21 11:50:55 -07:00
John Huang
4a60d1cddf am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread 
Merge commit '7dc08fb070ff7455e794fc81645ccb4349cd152f' into gingerbread-plus-aosp

* commit '7dc08fb070ff7455e794fc81645ccb4349cd152f':
  Fix connect duration for un-established SIP calls.
 2010-10-21 11:46:55 -07:00
Nick Kralevich
6427fde659 Merge "allow dumpstate to work for non-root users." into gingerbread 2010-10-21 11:35:49 -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
John Huang
84adbf3770 Merge "Fix connect duration for un-established SIP calls." into gingerbread 2010-10-21 10:46:17 -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
Sylvain Fonteneau
c24ad3f9e5 am a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method. 
Merge commit 'a71354d76689802152c33af257092d639c03c421' into gingerbread-plus-aosp

* commit 'a71354d76689802152c33af257092d639c03c421':
  Enable presence check at application level using
 2010-10-21 09:38:49 -07:00
Nick Pelly
888ddb301c am 7ea5c45e: NFC settings cleanup. 
Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp

* commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
  NFC settings cleanup.
 2010-10-21 09:38:15 -07:00
Brad Fitzpatrick
318e1fe73b am 15358e14: Merge "Make the base direction of the Arabic error pages RTL" 
Merge commit '15358e145622df90942a444a63ae0006713b636d' into gingerbread-plus-aosp

* commit '15358e145622df90942a444a63ae0006713b636d':
  Make the base direction of the Arabic error pages RTL
 2010-10-21 09:10:55 -07:00
Brad Fitzpatrick
f0ae78949d am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL" 
Merge commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b' into gingerbread-plus-aosp

* commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b':
  Set the base direction of the Hebrew error pages to RTL
 2010-10-21 09:10:47 -07:00
Brad Fitzpatrick
c6a98bb73d resolved conflicts for merge of 368fdba4 to master 
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
 2010-10-21 07:39:10 -07:00
Brad Fitzpatrick
3789789c8f Merge "Make the base direction of the Arabic error pages RTL" 2010-10-21 07:18:18 -07:00
Brad Fitzpatrick
d504db89b9 Merge "Set the base direction of the Hebrew error pages to RTL" 2010-10-21 07:18:02 -07:00
James Dong
17308c25c4 am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread 
Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp

* commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26':
  File writer size estimation improvement
 2010-10-20 21:28:38 -07:00
Mathias Agopian
483d824271 am 2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread 
Merge commit '2b2da52608303b149d22418865e67c8030c70e73' into gingerbread-plus-aosp

* commit '2b2da52608303b149d22418865e67c8030c70e73':
  Add a test application to dump all the EGLConfig available
 2010-10-20 21:28:34 -07:00