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

7336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Kloba
114d254631 am 9eca703d: Merge change I499a9541 into eclair-mr2 
Merge commit '9eca703d08ef2ef81796519fdd60a774380c7d4c'

* commit '9eca703d08ef2ef81796519fdd60a774380c7d4c':
  setupRedirect() can throw. Catch it and signal the error.
 2009-10-12 11:18:08 -07:00
Patrick Scott
4e5552ba4a am 86806ce1: Process synchronous requests in the same RequestQueue. 
Merge commit '86806ce11a89260147d7c2efa2c192b711d923db'

* commit '86806ce11a89260147d7c2efa2c192b711d923db':
  Process synchronous requests in the same RequestQueue.
 2009-10-12 11:17:58 -07:00
Romain Guy
db68f96323 am 18d1255e: Prevents memory leaks by correctly detaching views in AbsListView. 
Merge commit '18d1255ebe83d73df34832f2197a1e51ea717b96'

* commit '18d1255ebe83d73df34832f2197a1e51ea717b96':
  Prevents memory leaks by correctly detaching views in AbsListView.
 2009-10-12 10:16:14 -07:00
android-build SharedAccount
9f2b548999 am 7f86d58f: Merge commit \'goog/eclair\' into eclair-release 
Merge commit '7f86d58f179085f5101fcce154fcd510b2a81089'

* commit '7f86d58f179085f5101fcce154fcd510b2a81089':
 2009-10-12 10:16:04 -07:00
Nick Pelly
bf1f31e02d am 8da09998: Fix regression. 
Merge commit '8da09998160b25ee7fa0e96333872360c63bf95a'

* commit '8da09998160b25ee7fa0e96333872360c63bf95a':
  Fix regression.
 2009-10-12 10:15:51 -07:00
Nick Pelly
6f7d66d614 am c926de31: Fix broken build. 
Merge commit 'c926de31bcc8de204670d06ed3fb0d129d94d24f'

* commit 'c926de31bcc8de204670d06ed3fb0d129d94d24f':
  Fix broken build.
 2009-10-12 10:15:39 -07:00
Elliott Hughes
d3c8e3b51e resolved conflicts for merge of f92c106c to master 2009-10-09 12:22:32 -07:00
The Android Open Source Project
0edc448c89 am 30ef37ff: Merge commit \'remotes/goog/eclair\' into eclair-release 
Merge commit '30ef37ffb73fca5ef57031058e7630ac564355c8'

* commit '30ef37ffb73fca5ef57031058e7630ac564355c8':
 2009-10-07 14:01:21 -07:00
Jeff Hamilton
71ac88ad3d am 082c2af6: EventLog when a database file is deleted due to corruption. 
Merge commit '082c2af6859dff103e781b372dfde927cc0f869f'

* commit '082c2af6859dff103e781b372dfde927cc0f869f':
  EventLog when a database file is deleted due to corruption.
 2009-10-07 14:01:13 -07:00
The Android Open Source Project
e79e351979 am 21aa747f: Merge commit \'remotes/goog/eclair\' into eclair-release 
Merge commit '21aa747f28d20bc34dc2969d5a7f67356e0eb141'

* commit '21aa747f28d20bc34dc2969d5a7f67356e0eb141':
 2009-10-07 14:01:05 -07:00
The Android Open Source Project
52d526fb7c am e41f3517: Merge commit \'remotes/goog/eclair\' into eclair-release 
Merge commit 'e41f3517be1aadf68574e4b18104400acdccc950'

* commit 'e41f3517be1aadf68574e4b18104400acdccc950':
 2009-10-07 14:00:56 -07:00
Christopher Tate
c61a28edc2 am 00db92e7: Don\'t forget to clear "backup in progress" state when finishing a pass 
Merge commit '00db92e7e4ff53d658cffc8f42a3e0783cb1e2b0'

* commit '00db92e7e4ff53d658cffc8f42a3e0783cb1e2b0':
  Don't forget to clear "backup in progress" state when finishing a pass
 2009-10-07 14:00:49 -07:00
Dianne Hackborn
b443800567 am df72b14f: Fix issue #2148939: Sholes slow to wake up in landscape mode 
Merge commit 'df72b14fae157d56ec549877b71a250ccca3f08e'

* commit 'df72b14fae157d56ec549877b71a250ccca3f08e':
  Fix issue #2148939: Sholes slow to wake up in landscape mode
 2009-10-07 14:00:39 -07:00
Robert Greenwalt
bd47a12a13 Merge commit '44685eb4' into manualmerge 
Conflicts:
	telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
 2009-10-07 12:14:19 -07:00
The Android Open Source Project
0ac500f097 am 2caa215a: Merge commit \'remotes/goog/eclair\' into eclair-release 
Merge commit '2caa215a64f493ef26cbaaf1663ccd16dda9de28'

* commit '2caa215a64f493ef26cbaaf1663ccd16dda9de28':
 2009-10-07 11:06:34 -07:00
android-build SharedAccount
1dc6b57d47 am e89fec34: Merge commit \'goog/eclair\' into eclair-release 
Merge commit 'e89fec340c15da38f6e7e9a9cceccd0734fb16eb'

* commit 'e89fec340c15da38f6e7e9a9cceccd0734fb16eb':
 2009-10-07 11:06:25 -07:00
Android (Google) Code Review
20a95915b8 am d14c5398: Merge change 26821 into eclair 
Merge commit 'd14c53989820f2d12e58bcdd6872609baed827d5'

* commit 'd14c53989820f2d12e58bcdd6872609baed827d5':
  Merge change 26821 into eclair
 2009-10-07 11:06:17 -07:00
Grace Kloba
cca993bdef resolved conflicts for merge of bf54f02b to master 2009-10-07 09:42:35 -07:00
Android (Google) Code Review
5d6f6991f4 am 8c2623e9: Merge change 26908 into eclair 
Merge commit '8c2623e9978a517bda6429f01f486ef1755a0be8'

* commit '8c2623e9978a517bda6429f01f486ef1755a0be8':
  Merge change 26908 into eclair
 2009-10-07 09:26:05 -07:00
Doug Kwan
4633c49daa Add back missing shared libraries used in executables in link commands. These 
executables have calls to some shared libraries without explicitly linking
them.  Currently it works as linker links these libraries via dependencies of
other libraries.  This is fragile and not the right thing to do.
 2009-10-04 19:27:57 -07:00
Android (Google) Code Review
0730b80d66 Merge change I499a9541 into eclair-mr2 
* changes:
  setupRedirect() can throw. Catch it and signal the error.
 2009-10-02 16:28:11 -04:00
Android (Google) Code Review
613e3decf2 Merge change Ibdced0b5 
* changes:
  Remove unused #includes.
 2009-10-02 13:47:48 -04:00
Marco Nelissen
5db6e550dd am 88be4cb5: am 9b150b74: Close the cursor before assigning a new one to the same variable. 
Merge commit '88be4cb5ee6718a971f18cc14a5699204d28e082'

* commit '88be4cb5ee6718a971f18cc14a5699204d28e082':
  Close the cursor before assigning a new one to the same variable.
 2009-10-01 15:12:55 -07:00
Daniel Sandler
80434fac81 am 8da45e9e: am 87b94b13: Merge change I6e01fa52 into eclair 
Merge commit '8da45e9ee989df2215a49552609713d817c076ef'

* commit '8da45e9ee989df2215a49552609713d817c076ef':
  Remove unneeded icon.
 2009-10-01 15:12:44 -07:00
Michael Chan
2965b5c013 am 50bd2992: am 5a463a69: Merge change Ic2a16d4f into eclair 
Merge commit '50bd2992b1917d14c5bc79659820e4017c7e049c'

* commit '50bd2992b1917d14c5bc79659820e4017c7e049c':
  b/2148252 Fix emulator
 2009-10-01 15:12:26 -07:00
Mike Reed
363b2eb137 am bd2973db: am bbed0d68: hide setGammaForText, which is only used for calibrating new devices 
Merge commit 'bd2973db0b0c2354b2ca793beed5048e66fbd023'

* commit 'bd2973db0b0c2354b2ca793beed5048e66fbd023':
  hide setGammaForText, which is only used for calibrating new devices
 2009-10-01 15:11:49 -07:00
Jeff Sharkey
772d6081e9 am b28e9c9e: am c00099ef: Change intent flags for launching FastTrack. 
Merge commit 'b28e9c9ebe811e62eda912285e091f26f53cce9b'

* commit 'b28e9c9ebe811e62eda912285e091f26f53cce9b':
  Change intent flags for launching FastTrack.
 2009-10-01 15:11:30 -07:00
Mathias Agopian
306be4b947 am 3d9d5fc0: am 271cfe85: Merge change Ia8826d67 into eclair 
Merge commit '3d9d5fc063777b42cd51d7020f126685c8138ce5'

* commit '3d9d5fc063777b42cd51d7020f126685c8138ce5':
  improve boot animation a bit
 2009-10-01 14:01:10 -07:00
Bjorn Bringert
402c751427 am 51654b56: am a6309c30: On BACK in search, hide just IME if IME is fullscreen 
Merge commit '51654b562b3faaf358b55124ad5290847bdceabd'

* commit '51654b562b3faaf358b55124ad5290847bdceabd':
  On BACK in search, hide just IME if IME is fullscreen
 2009-10-01 14:00:42 -07:00
Bjorn Bringert
020d0bdb77 am 38325cb2: am 95c98dd5: Merge change Ie69a9c0a into eclair 
Merge commit '38325cb2d9c221691f37786a122e84043b5bcb90'

* commit '38325cb2d9c221691f37786a122e84043b5bcb90':
  Remove globalSearch argument from triggerSearch()
 2009-10-01 13:59:48 -07:00
Mike Cleron
313a107037 am e7937a9e: am f0e5ca7e: Merge change I55c9c7b7 into eclair 
Merge commit 'e7937a9ec6d837b7f19810d0a05c58c10ebdff0d'

* commit 'e7937a9ec6d837b7f19810d0a05c58c10ebdff0d':
  New 1x status bar icons
 2009-10-01 13:59:17 -07:00
Hung-ying Tyan
60c3cbeb6c am 3d95dfc4: am 62de7421: Merge change I4fe2a47a into eclair 
Merge commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5'

* commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5':
  Fix stopping all vpn daemons before connect and more.
 2009-10-01 13:58:52 -07:00
Romain Guy
c4d798dc68 am 43674307: am 9825ec61: Prevents the WindowManager from requesting empty or negative surfaces. 
Merge commit '436743075aa3994365dc8c72a6be3ec90cb44d69'

* commit '436743075aa3994365dc8c72a6be3ec90cb44d69':
  Prevents the WindowManager from requesting empty or negative surfaces.
 2009-10-01 13:58:08 -07:00
Mike Cleron
cafa623ef5 am 644a6bec: am ae5dd1d1: Merge change Ia1baa5ab into eclair 
Merge commit '644a6bec1c95f761ce36fe34dc2cd7e704abd133'

* commit '644a6bec1c95f761ce36fe34dc2cd7e704abd133':
  More icons
 2009-10-01 13:57:04 -07:00
Mike LeBeau
e1ba0bfb31 am d3128570: am be000b53: Merge change I793b4f62 into eclair 
Merge commit 'd31285708cf03c010b16c63f8380b8a6155e256b'

* commit 'd31285708cf03c010b16c63f8380b8a6155e256b':
  Clean up search and voice search button assets for high res.
 2009-10-01 13:56:22 -07:00
Grace Kloba
6ebceda60a am ad433430: am 00f60363: Merge change I2919f492 into eclair 
Merge commit 'ad433430126bec9a1361dd857635aa494d3d6a10'

* commit 'ad433430126bec9a1361dd857635aa494d3d6a10':
  remove cert for SampleBrowserPlugin and only check
 2009-10-01 13:55:11 -07:00
Dianne Hackborn
394949065e am 41829e01: am e88846ee: Semi-workaround for #2027266: app drawer showing up on the side of the screen 
Merge commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39'

* commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39':
  Semi-workaround for #2027266: app drawer showing up on the side of the screen
 2009-10-01 13:54:45 -07:00
Dianne Hackborn
683dc84ff0 am 943c8e7d: am 29e4a3c5: Update from API review. 
Merge commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae'

* commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae':
  Update from API review.
 2009-10-01 13:53:46 -07:00
Jim Miller
d3b8ca88ab am d42a7152: am d9b6f14a: Adjust opacity for inactive dimple in rotary widget 
Merge commit 'd42a7152aa7b0673df6c8a13a8fc50e137aca70f'

* commit 'd42a7152aa7b0673df6c8a13a8fc50e137aca70f':
  Adjust opacity for inactive dimple in rotary widget
 2009-10-01 13:53:27 -07:00
Evan Millar
583ee2ab8a am cbbfd38f: am 9901e38a: Merge change I7a39c564 into eclair 
Merge commit 'cbbfd38fc581a8b2d64faa898e5ac7fb924b3d95'

* commit 'cbbfd38fc581a8b2d64faa898e5ac7fb924b3d95':
  Fix docs error
 2009-10-01 13:52:03 -07:00
Robert Greenwalt
b742b32852 am 14123084: am a1323c77: Merge change Iaf08eabc into eclair 
Merge commit '1412308467116347e0443117b358c63da103774f'

* commit '1412308467116347e0443117b358c63da103774f':
  Reduce the ConnectivityManager logging.
 2009-10-01 13:51:35 -07:00
Ray Chen
99714035fd am a6715ca6: am f09edd60: Merge change Id60fa26a into eclair 
Merge commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa'

* commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa':
  Fix issue 2152541	thumbnail images stretched.
 2009-10-01 13:51:07 -07:00
Mike Cleron
616e994a53 am 29c72ef3: am 59a2c295: Merge change Id703d6bb into eclair 
Merge commit '29c72ef336152f6b0bef6e99e0e76e07750fba3f'

* commit '29c72ef336152f6b0bef6e99e0e76e07750fba3f':
  Black is the new black
 2009-10-01 13:50:38 -07:00
Evan Millar
7aa99844ab am 65114403: am 5042f7ea: Unhide ContactsContract#QuickContact and fix sdk build 
Merge commit '65114403bf947b04804d846b9fd67e85a57b933b'

* commit '65114403bf947b04804d846b9fd67e85a57b933b':
  Unhide ContactsContract#QuickContact and fix sdk build
 2009-10-01 13:50:18 -07:00
Robert Greenwalt
eb55345a0a am 91a13318: am e6b27966: Merge change I94132420 into eclair 
Merge commit '91a13318d4c44edcd10a1ed7021d1ef7ff8893b1'

* commit '91a13318d4c44edcd10a1ed7021d1ef7ff8893b1':
  Fix network-feature timeout code.
 2009-10-01 13:49:20 -07:00
Grace Kloba
b258ef02f1 am ff9af3f3: am 9d33d953: Merge change I07729abd into eclair 
Merge commit 'ff9af3f3ee0300e9aee93435008cfb62d5bee600'

* commit 'ff9af3f3ee0300e9aee93435008cfb62d5bee600':
  Keep the scrollbar on during TOUCH_MOVE events even
 2009-10-01 13:49:01 -07:00
Fred Quintana
c269c858d2 am d5aa6028: am c868acf4: show events in the UI 
Merge commit 'd5aa602861f154629960a285422819092b63ae7b'

* commit 'd5aa602861f154629960a285422819092b63ae7b':
  show events in the UI
 2009-10-01 13:48:40 -07:00
Jaikumar Ganesh
c8d5a1ff0a am eff77e9a: am 8ad6d524: Merge change I55e15bad into eclair 
Merge commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7'

* commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7':
  Try to reconnect twice when the rfcomm error code is Connection Refused.
 2009-10-01 13:45:43 -07:00
Evan Millar
e3c6b8fadf am eebbe04f: am 35de7ef8: Merge change I98f2db38 into eclair 
Merge commit 'eebbe04fdca964afaa294bad1c3ed7a68dd1d938'

* commit 'eebbe04fdca964afaa294bad1c3ed7a68dd1d938':
  FastTrack->QuickContact
 2009-10-01 13:45:20 -07:00
Robert Greenwalt
a3a4e6c972 am 4fc99930: am 7648bd1f: Merge change Ibb5626c5 into eclair 
Merge commit '4fc99930a0329dbdc92aa5e0d82c7a406e5f6d6c'

* commit '4fc99930a0329dbdc92aa5e0d82c7a406e5f6d6c':
  Stop bringing the wifi interface up on reset.
 2009-10-01 13:44:54 -07:00