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

3310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Kloba
8bc02bd73e resolved conflicts for merge of b8802b21 to master 2009-08-03 10:49:58 -07:00
Android (Google) Code Review
d43b5246cc Merge change 9259 
* changes:
  Fix the cookie order. If multiple cookies satisfy the criteria, the one with more specfic Path precede thoese with less specific.
 2009-08-03 10:23:58 -07:00
Android (Google) Code Review
d35ca9d5f1 Merge change 9330 into donut 
* changes:
  Fix #2025900. If a https request is canceled while openConnection is called and a ssl error happened, the http thread can be blocked for up to 10 min. Added code to detect this case and unlock the thread.
 2009-08-03 10:07:00 -07:00
Android (Google) Code Review
6505f801f9 Merge change 9455 
* changes:
  Close the "Please connect charger" alert after a charger is connected.
 2009-08-03 06:39:15 -07:00
Hung-ying Tyan
e8f62ac211 am 93540670: Issue an error when VPN connection is lost. 
Merge commit '935406709edb9aaf6538e23e88ecfdf77cccd8ba'

* commit '935406709edb9aaf6538e23e88ecfdf77cccd8ba':
  Issue an error when VPN connection is lost.
 2009-08-03 01:38:00 -07:00
Hung-ying Tyan
b064458185 Issue an error when VPN connection is lost. 
+ Add new error code CONNECTION_LOST to VpnManager.
+ Make VpnService call onError() instead of onDisconnect() when
connection is lost.
+ Make VpnService broadcast CONNECTION_LOST when that happens.
 2009-08-03 16:22:24 +08:00
Chung-yih Wang
3f68f2421b am dc1d5704: Fix the auto notification cleanup when vpn is disconnected. 
Merge commit 'dc1d5704a725d207b98de1b117847297958d9148'

* commit 'dc1d5704a725d207b98de1b117847297958d9148':
  Fix the auto notification cleanup when vpn is disconnected.
 2009-08-03 00:16:23 -07:00
Android (Google) Code Review
4851d01930 Merge change 9397 
* changes:
  Fix Win32 libutils to get a working SDK build.
 2009-08-01 01:55:07 -07:00
David 'Digit' Turner
429db150af Fix Win32 libutils to get a working SDK build. 2009-08-01 10:53:29 +02:00
Android (Google) Code Review
f3b19c4012 Merge change 9439 
* changes:
  Split RenderScript Type and Allocation into seperate classes.
 2009-07-31 20:42:29 -07:00
Android (Google) Code Review
5e2ae8dca5 am b86bad94: Merge change 9438 into donut 
Merge commit 'b86bad9493a331a09dd765bc6e725c0aec969ff6'

* commit 'b86bad9493a331a09dd765bc6e725c0aec969ff6':
  Change some log.i to log.d.
 2009-07-31 20:18:23 -07:00
Android (Google) Code Review
23c95b3b32 Merge change 9438 into donut 
* changes:
  Change some log.i to log.d.
 2009-07-31 20:15:15 -07:00
Hung-ying Tyan
6cdee58010 Change some log.i to log.d. 2009-08-01 10:11:46 +08:00
Android (Google) Code Review
aef6a231f7 Merge change 9430 
* changes:
  Update docs.
 2009-07-31 17:59:53 -07:00
Jean-Baptiste Queru
731b8bad97 am 3159e326: Merge snapshot variant of donut back into the tree 
Merge commit '3159e3260e7e380469b5af353cc8af17525dbf20'

* commit '3159e3260e7e380469b5af353cc8af17525dbf20':
  donut snapshot
 2009-07-31 17:47:39 -07:00
Jean-Baptiste Queru
f8c8a652cd Merge snapshot variant of donut back into the tree 2009-07-31 17:43:58 -07:00
Jean-Baptiste Queru
110b314673 donut snapshot 2009-07-31 17:38:20 -07:00
Android (Google) Code Review
df581bf3ea Merge change 9413 
* changes:
  Begin splitting up RenderScript.java into seperate classes.  First piece split off Element.
 2009-07-31 16:29:11 -07:00
Android (Google) Code Review
61e701c0fb Merge changes 9415,9416 
* changes:
  log opengl-call-with-no-context only once per thread, instead of for each function call
  don't crash in Parcel when given a null (and therfore invalid) native_handle_t
 2009-07-31 16:25:49 -07:00
Mathias Agopian
d274eae545 log opengl-call-with-no-context only once per thread, instead of for each function call 2009-07-31 16:23:03 -07:00
Mathias Agopian
1d0a95b12a don't crash in Parcel when given a null (and therfore invalid) native_handle_t 2009-07-31 16:18:16 -07:00
Android (Google) Code Review
334a4a7cf4 Merge change 9391 
* changes:
  be more robust when errors occur upon EGL surface creation (ie: don't crash)
 2009-07-31 15:12:54 -07:00
Mathias Agopian
cf81c84e43 be more robust when errors occur upon EGL surface creation (ie: don't crash) 2009-07-31 14:47:00 -07:00
Scott Main
60da4f44f1 am af09b67f: add api level doc to the appendix 
Merge commit 'af09b67f31195340623ced993f71c8b1a248b9a3'

* commit 'af09b67f31195340623ced993f71c8b1a248b9a3':
  add api level doc to the appendix
 2009-07-31 14:22:02 -07:00
Android (Google) Code Review
ea763458fa Merge change 9372 
* changes:
  The IOMX interface now instantiates IOMXRenderers to hide the details of hardware accelerated blitting.
 2009-07-31 13:10:51 -07:00
Andreas Huber
764d4ab456 The IOMX interface now instantiates IOMXRenderers to hide the details of hardware accelerated blitting. 2009-07-31 12:48:53 -07:00
Android (Google) Code Review
7079cfd6f3 Merge change 9359 
* changes:
  Add several math functions to rsScript_Lib.
 2009-07-31 11:49:32 -07:00
Android (Google) Code Review
176411fe72 Merge change 9354 
* changes:
  Handle SMS during CDMA emergency callback mode
 2009-07-31 11:15:28 -07:00
Android (Google) Code Review
7ad602b364 Merge change 9216 
* changes:
  Fix UUID typo and allow incoming AVRCP connections.
 2009-07-31 10:41:27 -07:00
Android (Google) Code Review
3e27ed48f3 am 17c195c8: Merge change 9340 into donut 
Merge commit '17c195c8da3470b2e69880e206342f0c2d85f938'

* commit '17c195c8da3470b2e69880e206342f0c2d85f938':
  Fix issue 2025872: Deadlock in SoundPool.stop
 2009-07-31 08:55:51 -07:00
Android (Google) Code Review
7671e0279e Merge change 9340 into donut 
* changes:
  Fix issue 2025872: Deadlock in SoundPool.stop
 2009-07-31 08:50:45 -07:00
Android (Google) Code Review
7392b40feb am dccfaefd: Merge change 9285 into donut 
Merge commit 'dccfaefd681a3895f6d4f9eedd106be817e1555d'

* commit 'dccfaefd681a3895f6d4f9eedd106be817e1555d':
  Clear singleton reference during JetPlayer.release()
 2009-07-31 07:15:30 -07:00
Android (Google) Code Review
11369693b6 Merge change 9285 into donut 
* changes:
  Clear singleton reference during JetPlayer.release()
 2009-07-31 07:11:25 -07:00
Android (Google) Code Review
916a4f7655 Merge change 9334 
* changes:
  Flip the use of triangle icon on the right of settings.
 2009-07-31 00:01:49 -07:00
Android (Google) Code Review
a9132f5a9e Merge change 9329 
* changes:
  Smoother transitions in GrassRS
 2009-07-30 22:39:58 -07:00
Android (Google) Code Review
fad9502338 Merge change 9324 
* changes:
  Second word lost when SMS is received from email
 2009-07-30 22:22:02 -07:00
Android (Google) Code Review
0500356538 am 3e584428: Merge change 9124 into donut 
Merge commit '3e584428deb098484cc881192dd221c81f707764'

* commit '3e584428deb098484cc881192dd221c81f707764':
  Fix a bug in ImageView: The drawing matrix is not updated when setImageMatrix is called.
 2009-07-30 19:55:47 -07:00
Android (Google) Code Review
ed2e8e6139 Merge change 9124 into donut 
* changes:
  Fix a bug in ImageView: The drawing matrix is not updated when setImageMatrix is called.
 2009-07-30 19:53:47 -07:00
Android (Google) Code Review
fa170f5133 Merge change 9287 
* changes:
  fixed some issues with the software renderer when surfaces are made current.
 2009-07-30 18:46:48 -07:00
Mathias Agopian
cb6b904164 fixed some issues with the software renderer when surfaces are made current. 
there was several issues:
- when a surface was made non-current, the last frame wasn't shown and the buffer could stay locked
- when a surface was made current the 2nd time, it would not dequeue a new buffer

now, queue/dequeue are done when the surface is made current.

for this to work, a new query() hook had to be added on android_native_window_t, it allows to retrieve some attributes of a window (currently only width and height).
 2009-07-30 18:14:56 -07:00
Android (Google) Code Review
b6db63a126 Merge change 9267 
* changes:
  Don't invalidate view if setEnabled doesn't change the state.
 2009-07-30 16:55:04 -07:00
Android (Google) Code Review
87582aa573 am c134c281: Merge change 9265 into donut 
Merge commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f'

* commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f':
  Highlight IMEI-reading as part of READ_PHONE_STATE description
 2009-07-30 16:20:51 -07:00
Android (Google) Code Review
740dfb83a8 Merge change 9265 into donut 
* changes:
  Highlight IMEI-reading as part of READ_PHONE_STATE description
 2009-07-30 16:18:21 -07:00
Android (Google) Code Review
67f3b76b83 Merge change 9260 
* changes:
  Fix crash while dialing "*228;1"
 2009-07-30 16:14:38 -07:00
Android (Google) Code Review
1412574a48 am 1247a644: Merge change 9243 into donut 
Merge commit '1247a6444bb9f006e0b9def5cd15d626785424bb'

* commit '1247a6444bb9f006e0b9def5cd15d626785424bb':
  Clean up RIL_SIM_* in RILConstants
 2009-07-30 16:07:57 -07:00
Mike LeBeau
f1f5cf4381 am c2e06072: Tell the SearchManager to stopSearch before starting an in-app voice search. Without this, because of the recent changes to how the search dialog hides and resumes, we end up re-showing the search dialog after returning to the app from voice search, obscu 
Merge commit 'c2e06072051e319bc609df66f4c72b77716f4fa4'

* commit 'c2e06072051e319bc609df66f4c72b77716f4fa4':
  Tell the SearchManager to stopSearch before starting an in-app voice
 2009-07-30 16:07:50 -07:00
Jaikumar Ganesh
3ebe645e3a am f4fbdfa5: Update current.xml after review comments. 
Merge commit 'f4fbdfa53fe0497d9b1f3b9642df357bb765e84f'

* commit 'f4fbdfa53fe0497d9b1f3b9642df357bb765e84f':
  Update current.xml after review comments.
 2009-07-30 16:07:30 -07:00
Android (Google) Code Review
a743a8162b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-30 16:07:30 -07:00
Jaikumar Ganesh
77de6e058a am 0da3bdb4: Fix public API caused due to CDMA changes. 
Merge commit '0da3bdb476086db02a1076780676b21e239c79d6'

* commit '0da3bdb476086db02a1076780676b21e239c79d6':
  Fix public API caused due to CDMA changes.
 2009-07-30 16:07:11 -07:00
Mike Reed
5c82ba745b am 6af2552d: use safeUnref() since the other macro is not defined in donut 
Merge commit '6af2552d244ff933dfd54570121db455cc7c3cda'

* commit '6af2552d244ff933dfd54570121db455cc7c3cda':
  use safeUnref() since the other macro is not defined in donut
 2009-07-30 16:06:31 -07:00