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

14656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
0887ab4d10 merge from open-source master 
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
 2010-06-09 12:14:58 -07:00
Jean-Baptiste Queru
1e254923ea Merge "Adding mimetypes to the mimetype map used in the web view" 2010-06-09 10:51:16 -07:00
The Android Open Source Project
ae68e08411 ignore from open-source master 
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
 2010-06-09 09:21:39 -07:00
Jean-Baptiste Queru
64ba44a221 Merge "Fix for deadlock between StatusBarService and NotificationManagerService" 2010-06-09 07:28:50 -07:00
The Android Open Source Project
1e94155433 merge from open-source master 
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
 2010-06-09 07:14:36 -07:00
Jim Miller
91874c12e2 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled
 2010-06-08 16:33:22 -07:00
Jim Miller
5ca447aa0c Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:31:32 -07:00
Jean-Baptiste Queru
2b4c33ff92 Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend" 2010-06-08 15:43:02 -07:00
The Android Open Source Project
57e32fb1ce merge from open-source master 
Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
 2010-06-08 13:17:41 -07:00
Romain Guy
002415834b am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into froyo-plus-aosp

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.
 2010-06-08 13:01:05 -07:00
Romain Guy
649329c3da Merge "Add a method to hide/show a SurfaceView's surface." into froyo 2010-06-08 12:59:36 -07:00
Jean-Baptiste Queru
56d23925ed Merge "Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https." 2010-06-08 10:19:51 -07:00
Jim Miller
9ae0a98f37 am cb52cb52: Fix SDK build. 
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into froyo-plus-aosp

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
 2010-06-07 21:23:33 -07:00
Jim Miller
4c58e3ac69 am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.
 2010-06-07 19:26:28 -07:00
Jim Miller
c354b89c76 Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-07 19:24:45 -07:00
Christopher Tate
f023c4ce5b am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo 
Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into froyo-plus-aosp

* commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
  Don't bring up Launcher until after boot complete
 2010-06-07 18:49:07 -07:00
Christopher Tate
e1855846a4 Merge "Don't bring up Launcher until after boot complete" into froyo 2010-06-07 18:46:46 -07:00
Dianne Hackborn
2484ce43dd am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 
Merge commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into froyo-plus-aosp

* commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
  Fix issue #2749322: addPackageToPreferred throws SecurityException
 2010-06-07 18:32:41 -07:00
Dianne Hackborn
73f8edb0d6 Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 2010-06-07 17:32:02 -07:00
Robert Greenwalt
c2d073a78e am 5a671d03: Cut logging, boost efficiency of ThrottleService 
Merge commit '5a671d03e3abe522a761a43b0460f9f3816b14ed' into froyo-plus-aosp

* commit '5a671d03e3abe522a761a43b0460f9f3816b14ed':
  Cut logging, boost efficiency of ThrottleService
 2010-06-07 16:59:23 -07:00
The Android Open Source Project
33f7b83776 merge from open-source master 
Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
 2010-06-07 16:37:22 -07:00
The Android Open Source Project
e475488b11 merge from open-source master 
Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
 2010-06-07 16:32:53 -07:00
Jean-Baptiste Queru
a0abbe38b9 Merge "Canvas.drawVertices: correct color range-check" 2010-06-07 14:51:42 -07:00
Christopher Tate
076c8394fa am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo 
Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into froyo-plus-aosp

* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
  Watchdog now records kernel stacks when it fires
 2010-06-04 18:07:07 -07:00
Christopher Tate
7188d6887e Merge "Watchdog now records kernel stacks when it fires" into froyo 2010-06-04 18:06:07 -07:00
Dianne Hackborn
f896be96c9 am 5474902f: Merge "xhdpi" into froyo 
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into froyo-plus-aosp

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
 2010-06-04 16:33:48 -07:00
Dianne Hackborn
28b9f6e900 Merge "xhdpi" into froyo 2010-06-04 16:32:01 -07:00
Robert Greenwalt
227232f703 am f9610b38: Merge "Make the DUN apn data secure." into froyo 
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
 2010-06-04 15:57:21 -07:00
Robert Greenwalt
0f3ca0faea Merge "Make the DUN apn data secure." into froyo 2010-06-04 15:55:09 -07:00
Jeff Hamilton
e0f5def3fd am 4b330921: Don\'t crash when low storage is encountered pre-boot completion. 
Merge commit '4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp

* commit '4b3309211ed6f3532b44481945a4725143d50b8a':
  Don't crash when low storage is encountered pre-boot completion.
 2010-06-04 13:50:31 -07:00
The Android Open Source Project
dc544d2168 merge from open-source master 
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
 2010-06-04 11:08:36 -07:00
Andreas Huber
dc9c0cb435 am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 
Merge commit '2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp

* commit '2e3761ba43f634e97ac493f4b79e5e53954a1491':
  Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
 2010-06-03 15:30:03 -07:00
Andreas Huber
da26806e79 Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:28:13 -07:00
Romain Guy
ec39747a76 Merge "Add better error handling for savePicture and restorePicture" 2010-06-03 14:26:21 -07:00
Dirk Dougherty
daca1ada02 am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 
Merge commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp

* commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
  Doc change: Adjust security sandbox description.
 2010-06-03 12:58:35 -07:00
Dirk Dougherty
c253940208 Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 12:57:06 -07:00
James Dong
1ce3ee8a00 am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 
Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp

* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
  Fix a Javadoc to clarify when setAudioStreamType() should be called.
 2010-06-03 11:27:19 -07:00
James Dong
c1cf2705d5 Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:26:09 -07:00
The Android Open Source Project
1531d2f979 merge from open-source master 
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
 2010-06-03 09:03:58 -07:00
Scott Main
a689e8ed41 am 6a297118: Merge "docs: a couple doc bug fixes" into froyo 
Merge commit '6a297118724f31b1063b74f52295d459ec4f58dc' into froyo-plus-aosp

* commit '6a297118724f31b1063b74f52295d459ec4f58dc':
  docs: a couple doc bug fixes
 2010-06-02 13:44:44 -07:00
Scott Main
e66d578d71 Merge "docs: a couple doc bug fixes" into froyo 2010-06-02 13:43:18 -07:00
The Android Open Source Project
44cb1fe3e4 merge from open-source master 
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
 2010-06-02 08:54:47 -07:00
The Android Open Source Project
c99c7120c3 merge from open-source master 
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
 2010-06-02 08:41:59 -07:00
Mathias Palmqvist
a409e195fe Use stride for source and target buffers when copybit is enabled. 
Change-Id: Ie651013b3522f8e004685d74190da86433086307
 2010-06-02 16:03:04 +02:00
Kenny Root
792e065b20 Merge "Improved error-handling in Rfc822Tokenizer" 2010-06-01 22:56:39 -07:00
Dirk Dougherty
7c7eadeb4f am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo 
Merge commit 'de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp

* commit 'de56c27dab020bf85187c8bcfc6842cb31006c59':
  Doc change: rename slide decks for sorting by year then quarter.
 2010-06-01 15:45:24 -07:00
Dirk Dougherty
4005afd071 Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo 2010-06-01 15:44:02 -07:00
Dan Egnor
d691a841f6 am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo 
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp

* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
  Comment-only change to add documentation for FileObserver
 2010-06-01 14:28:46 -07:00
Dan Egnor
f192ba713b Merge "Comment-only change to add documentation for FileObserver" into froyo 2010-06-01 14:09:20 -07:00
Dirk Dougherty
88e4f7fb39 am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo 
Merge commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp

* commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
  Doc change: updated dashboards stats.
 2010-06-01 11:07:56 -07:00