ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
17,672 Commits 2 Branches 0 Tags 54 MiB
46adfbc949
Commit Graph

17672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
46adfbc949 am ae66946b: Merge "fix a race in SF buffer management" into gingerbread 
Merge commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30' into gingerbread-plus-aosp

* commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30':
  fix a race in SF buffer management
 2010-08-27 12:23:35 -07:00
Brad Fitzpatrick
2e48f7e4e3 am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp

* commit '9020595b7f376bb414c9a6dba216dec76ababb17':
  Fix closing tag in docs.
 2010-08-27 12:23:30 -07:00
Brad Fitzpatrick
4be6b11700 resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp 
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
 2010-08-27 12:08:40 -07:00
Mathias Agopian
e5b4978094 Merge "fix a race in SF buffer management" into gingerbread 2010-08-27 11:47:33 -07:00
Brad Fitzpatrick
12831aaacf am f5287094: Fix closing tag in docs. 
Merge commit 'f52870948d5d57d033fcdafc9c3fb0a872975447' into gingerbread

* commit 'f52870948d5d57d033fcdafc9c3fb0a872975447':
  Fix closing tag in docs.
 2010-08-27 11:35:53 -07:00
Brad Fitzpatrick
879e1ceecb Merge "SharedPreferences$Editor.startCommit()" into gingerbread 2010-08-27 11:21:13 -07:00
Gilles Debunne
d03f163cf9 am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 
Merge commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4' into gingerbread-plus-aosp

* commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4':
  DO NOT MERGE Text selection: tapping on selection opens context menu
 2010-08-27 10:34:56 -07:00
Gilles Debunne
0f6ded9a6a am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread 
Merge commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1' into gingerbread-plus-aosp

* commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1':
  Fix for 512 limit in assetManager.list
 2010-08-27 10:34:47 -07:00
Gilles Debunne
4ab6241a8e Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 2010-08-27 10:33:17 -07:00
Gilles Debunne
9c060fe8e0 Merge "Fix for 512 limit in assetManager.list" into gingerbread 2010-08-27 10:32:43 -07:00
Cary Clark
8c7738865c am c28bf25b: Merge "DO NOT MERGE copy selected text on tap" into gingerbread 
Merge commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c' into gingerbread-plus-aosp

* commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c':
  DO NOT MERGE copy selected text on tap
 2010-08-27 08:17:02 -07:00
Cary Clark
eb61092706 Merge "DO NOT MERGE copy selected text on tap" into gingerbread 2010-08-27 08:12:34 -07:00
Brad Fitzpatrick
bbeddcd4b9 am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread 
Merge commit 'cc033bd367a445d5e3f8de919cd155505b25274c' into gingerbread-plus-aosp

* commit 'cc033bd367a445d5e3f8de919cd155505b25274c':
  Fix some bugs in SettingsProvider that I introduced the other day.
 2010-08-26 17:58:04 -07:00
Brad Fitzpatrick
8a19c2db81 Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread 2010-08-26 17:54:36 -07:00
Mathias Agopian
0e7f4292c7 fix a race in SF buffer management 
also remove some unused code.

Change-Id: Iae2c3309b7a08055f3e13a5b866c5c084993e352
 2010-08-26 17:42:27 -07:00
Eric Rowe
ae98ee716a am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo 
Merge commit '8f5007ba4789e0c9e1a620e7211fa24143a66a0a' into gingerbread-plus-aosp

* commit '8f5007ba4789e0c9e1a620e7211fa24143a66a0a':
  Improve logging and flexibility of BT stress tests.
 2010-08-26 17:37:00 -07:00
Eric Rowe
97e391e530 am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo 
Merge commit '163fba0a75dd582aa62187a062faa66d60db0d34' into gingerbread

* commit '163fba0a75dd582aa62187a062faa66d60db0d34':
  Improve logging and flexibility of BT stress tests.
 2010-08-26 17:30:28 -07:00
Eric Rowe
6a8cde145d Merge "Improve logging and flexibility of BT stress tests." into froyo 2010-08-26 17:21:46 -07:00
Amith Yamasani
f4bfa602c5 am a90b7f01: Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText() to return the selected text. 
Merge commit 'a90b7f0125389b9e1040d2be82aad4ef74ea6071' into gingerbread-plus-aosp

* commit 'a90b7f0125389b9e1040d2be82aad4ef74ea6071':
  Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
 2010-08-26 14:57:31 -07:00
David Brown
37cc54dd70 am 846eb30f: Add SipAddress to ContactsContract. 
Merge commit '846eb30f78a9153102c743c2c1b49de1a4079fb1' into gingerbread-plus-aosp

* commit '846eb30f78a9153102c743c2c1b49de1a4079fb1':
  Add SipAddress to ContactsContract.
 2010-08-26 14:52:10 -07:00
Dianne Hackborn
ac2d75af2f am 02486b13: Hide heavy-weight API. 
Merge commit '02486b1327e3007c62d253dd89ba9db1852b87f8' into gingerbread-plus-aosp

* commit '02486b1327e3007c62d253dd89ba9db1852b87f8':
  Hide heavy-weight API.
 2010-08-26 14:46:43 -07:00
Joe Onorato
2894ee9ed7 am bc5d9d22: Merge "Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into gingerbread 
Merge commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f' into gingerbread-plus-aosp

* commit 'bc5d9d2254ee751ff50fb91d4560098ab5edf01f':
  Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
 2010-08-26 13:56:08 -07:00
Joe Onorato
d32b734835 Merge "Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into gingerbread 2010-08-26 13:54:13 -07:00
Andreas Huber
b8d816baa6 am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread 
Merge commit '17a765a139f5a0b10768937cb11ecd9e7941b039' into gingerbread-plus-aosp

* commit '17a765a139f5a0b10768937cb11ecd9e7941b039':
  Support for RTP packets arriving interleaved with RTSP responses.
 2010-08-26 13:49:32 -07:00
Andreas Huber
c46b7c50c1 Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread 2010-08-26 13:47:16 -07:00
Cary Clark
338d568a63 am ed101933: Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread 
Merge commit 'ed101933ab7506d841d6eaa7bebda4b674c38088' into gingerbread-plus-aosp

* commit 'ed101933ab7506d841d6eaa7bebda4b674c38088':
  DO NOT MERGE -- copy on tapping outside of selected text in gmail
 2010-08-26 12:08:05 -07:00
Joe Onorato
acd9302e28 am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work. 
Merge commit '00d1772d8cfb94066b757034055ac38897d161da' into gingerbread-plus-aosp

* commit '00d1772d8cfb94066b757034055ac38897d161da':
  Continue trying to make the turn off quickly after call feature work.
 2010-08-26 12:05:54 -07:00
Cary Clark
404860ee66 Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread 2010-08-26 12:04:51 -07:00
Joe Onorato
059e073d52 am 797e688b: Continue trying to make the turn off quickly after call feature work. 
Merge commit '797e688b3bebbf1f50a8ad08528740b064f79153' into gingerbread

* commit '797e688b3bebbf1f50a8ad08528740b064f79153':
  Continue trying to make the turn off quickly after call feature work.
 2010-08-26 12:02:51 -07:00
Joe Onorato
4fdd5857bf am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread 
Merge commit '274ad9824a20b61dfbb785621567fd0414a965a4' into gingerbread-plus-aosp

* commit '274ad9824a20b61dfbb785621567fd0414a965a4':
  Just disable widgets that come from apps on sd cards, because they don't work anyway.
 2010-08-26 11:55:10 -07:00
Joe Onorato
f3553da915 am cc45381e: Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread 
Merge commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6' into gingerbread-plus-aosp

* commit 'cc45381e596c6d2b351d2c5e9d07f4113e1d58b6':
  Fix typo that makes apps on sd work better with app widgets.
 2010-08-26 11:54:59 -07:00
Gilles Debunne
e0275057a4 am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt. 
Merge commit '62dbd82aad0f84c88212566321e3fb370affaf7c' into gingerbread-plus-aosp

* commit '62dbd82aad0f84c88212566321e3fb370affaf7c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
 2010-08-26 11:52:44 -07:00
Joe Onorato
0b2976f5c6 Merge "Just disable widgets that come from apps on sd cards, because they don't work anyway." into gingerbread 2010-08-26 11:50:31 -07:00
Joe Onorato
0b97a51b75 Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread 2010-08-26 11:50:28 -07:00
Eric Laurent
71bf6ae80d am c6d7a895: Merge "Changed type of reverb presets from int to short" into gingerbread 
Merge commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d' into gingerbread-plus-aosp

* commit 'c6d7a8953de9dd4e0af1dca69d83d810c05d809d':
  Changed type of reverb presets from int to short
 2010-08-26 11:04:01 -07:00
Gilles Debunne
198d280985 am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread 
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp

* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
  Fix for NPE in TextView.
 2010-08-26 11:01:34 -07:00
Eric Laurent
0e2410cb38 Merge "Changed type of reverb presets from int to short" into gingerbread 2010-08-26 11:01:06 -07:00
Gilles Debunne
26c7992743 Merge "Fix for NPE in TextView." into gingerbread 2010-08-26 10:58:58 -07:00
Guang Zhu
8e7d6be788 am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 
Merge commit '1c045003788725b40af5489149ac0fc8bfebb1ea' into gingerbread-plus-aosp

* commit '1c045003788725b40af5489149ac0fc8bfebb1ea':
  add mouse up/down/click support in DumpRenderTree
 2010-08-26 10:52:27 -07:00
Dianne Hackborn
015125608b am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp

* commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 10:50:11 -07:00
Guang Zhu
0d6c2a6f01 Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 2010-08-26 10:49:19 -07:00
Dianne Hackborn
3d66e77ef3 Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 2010-08-26 10:47:48 -07:00
Eric Laurent
4fb3a6e0f1 am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread 
Merge commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a' into gingerbread-plus-aosp

* commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a':
  Added automated tests for reverb audio effect.
 2010-08-26 10:19:23 -07:00
Eric Laurent
66f0eb4c10 Merge "Added automated tests for reverb audio effect." into gingerbread 2010-08-26 10:16:26 -07:00
James Dong
e1d522cc10 am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp

* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
  Make sure that timestamp does not go backward in MP4 file writer
 2010-08-26 09:53:30 -07:00
James Dong
e4295dc132 Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 2010-08-26 09:47:12 -07:00
Banavathu, Srinivas Naik
07048a6c5d am f3ee6f87: Telephony: Remove references to mExitECMRunnable object. 
Merge commit 'f3ee6f87a344b185d8bde12c77440c9020378510' into gingerbread-plus-aosp

* commit 'f3ee6f87a344b185d8bde12c77440c9020378510':
  Telephony: Remove references to mExitECMRunnable object.
 2010-08-26 09:02:33 -07:00
Robert Greenwalt
39729d08a2 Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
satok
4b1d46ad79 am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread 
Merge commit '913a8925c07e854a80bf5df87561f290d3a56d61' into gingerbread-plus-aosp

* commit '913a8925c07e854a80bf5df87561f290d3a56d61':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
 2010-08-26 07:01:28 -07:00
Chung-yih Wang
3f39a07a7d am 0858806f: Add Wifi High Perf. mode during a call. 
Merge commit '0858806ffcb9ff34725abb79106aa1de27d1bf60' into gingerbread-plus-aosp

* commit '0858806ffcb9ff34725abb79106aa1de27d1bf60':
  Add Wifi High Perf. mode during a call.
 2010-08-26 00:24:17 -07:00