33793 Commits

Author SHA1 Message Date
Mathias Agopian
8c409b7bb8 am 8b8a8f65: am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
Merge commit '8b8a8f65b5306aa557028feba7317470222a73df'

* commit '8b8a8f65b5306aa557028feba7317470222a73df':
  fix a bug where timeouts would only be handled when a message was delivered
2010-10-12 11:51:13 -07:00
Andreas Huber
fefcc9c26b am 5b0d0630: am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
Merge commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5'

* commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5':
  Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
2010-10-12 11:51:01 -07:00
Mike Lockwood
301f78bbbe am 431dd3b1: am 86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
Merge commit '431dd3b1bc8f2acf7cbcf08463649b5629baf398'

* commit '431dd3b1bc8f2acf7cbcf08463649b5629baf398':
  GPS: Add update_network_state call to AGpsRillInterface
2010-10-12 11:50:23 -07:00
Brad Fitzpatrick
98f0686553 am 3a4b7dfd: am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
Merge commit '3a4b7dfddab67c531dca23c6691063a829376d4f'

* commit '3a4b7dfddab67c531dca23c6691063a829376d4f':
  StrictMode: check max-offenses-per-loop earlier, before allocations
2010-10-12 11:50:04 -07:00
Mike Lockwood
697e23e89c Merge "MTP: allow renaming directories" 2010-10-12 11:42:33 -07:00
Romain Guy
c00972bb16 Don't recreate a new texture every time we draw a layer.
Change-Id: I3c28aff5acffc7c6f1ac74805869725426c62d28
2010-10-12 11:31:07 -07:00
Kenny Root
e1ff214e32 Add API to check for emulated external storage
When the storage is emulated, we don't want to install ASEC containers
to it. This adds the API to check when the external storage is emulated
and uses it to check whether or not to install packages to the external
storage in an ASEC container.

Bug: 3024387
Change-Id: Ia0318aca9e4938a4897deaada5603a4c7c1d0f48
2010-10-12 11:30:56 -07:00
Mike Lockwood
6a6a3aff17 MTP: allow renaming directories
Change-Id: I90849e7924f33a2f39dae400968f2eda64710beb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-12 14:19:51 -04:00
Xia Wang
425c305a53 Merge "resolved conflicts for merge of d4e3bf4d to master" 2010-10-12 11:07:11 -07:00
Xia Wang
a5496cd28c resolved conflicts for merge of d4e3bf4d to master
Change-Id: I41c0ae2b3f557f84b25c39e247894f66a4e7e702
2010-10-12 11:05:54 -07:00
Romain Guy
d10cd5765a Always create OpenGL accelerated windows in RGBA 8888.
Bug #3081600

The OpenGL renderer in libhwui uses a single EGL context per process and
thus create it with an RGBA 8888 EGL configuration. To ensure that all
windows are compatible with this configuration, this change modifies
the window manager and SurfaceFlinger.

The window manager now checks the window's flags and if the window is
hardware accelerated, it forces the window's pixel format to be
translucent when creating the surface. The window itself is still
marked as opaque if we know that the window will be opaque on screen.
This keeps existing optimizations in place.

Similarly in SurfaceFlinger, a translucent Surface can now be created
with the Surface.OPAQUE flag, indicating SurfaceFlinger that the surface
does not require blending, despite its RGBA 8888 configuration.

Change-Id: Ic747b6b12564ba064412d842117880fcc199eb7c
2010-10-12 11:00:18 -07:00
Bjorn Bringert
514c969ca7 Merge "Remove the unused UrlRendererService" 2010-10-12 10:57:15 -07:00
Romain Guy
5981289551 Merge "Don't set hwAccelerated=true when libhwui is not present." 2010-10-12 10:36:35 -07:00
Romain Guy
53ca03d9a3 Don't set hwAccelerated=true when libhwui is not present.
Change-Id: I6df5a89e4b4d94d76e96b5d0a678b7a8f646268a
2010-10-12 10:34:25 -07:00
Romain Guy
a655c63582 Actually store the newly computed deceleration.
Change-Id: Ib62470187ec7709340f04842748b9d8cb88ee0c2
2010-10-12 10:21:57 -07:00
Mike Lockwood
588fcde5bf Merge "MTP: Add support for renaming files" 2010-10-12 09:46:14 -07:00
Mike Lockwood
5ebac83e20 MTP: Add support for renaming files
Change-Id: I679d674eb4dae88f60165ab2850cc20eec7ceee3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-12 12:41:58 -04:00
Alex Sakhartchouk
7d4cb2e118 Merge "Fixing refcounting debug statements that've gotten bitrotten." 2010-10-12 09:40:23 -07:00
Alex Sakhartchouk
af55cc711a Fixing refcounting debug statements that've gotten bitrotten.
Change-Id: Ie93bf651b9e469b7b4e9cacd8f79b38d04012892
2010-10-12 09:31:10 -07:00
Jean-Baptiste Queru
9c9430b30f resolved conflicts for merge of e69f1f1a to master
Change-Id: I32b34e4f6ae83ff40398c6e9e2881af12abc4aa8
2010-10-12 09:23:10 -07:00
Bjorn Bringert
25108167fd Remove the unused UrlRendererService
Change-Id: I48af718d9753b475bd041147f0d18bee60da84ec
2010-10-12 15:14:27 +01:00
Bjorn Bringert
5684d464c0 Merge "Move SyncStateContentProviderHelper to frameworks/ex" 2010-10-12 02:31:42 -07:00
Wu-cheng Li
7b76bed1ee Merge "Fix camera display orientation." 2010-10-12 01:41:59 -07:00
Wu-cheng Li
b0f7d95bf8 Fix camera display orientation.
bug:3036262
Change-Id: I6fc3dc381fcfaceba09fd5bd14afb85045b3d676
2010-10-12 15:52:44 +08:00
Chris Tate
5994359f30 Be sure to hold the window manager lock around *Lw() methods
Change-Id: Ia0271df34b084bf1d3dc39373dd66b6afe96c379
2010-10-11 20:58:07 -07:00
Jeff Brown
26b6df74b9 Merge "Track input state when transferring touch focus." 2010-10-11 20:29:36 -07:00
Romain Guy
4bede9e425 Add an API to control AbsListView's friction.
Change-Id: Iafb08cd28703d282c369c472a5d85a22cc5dacb7
2010-10-11 19:38:37 -07:00
Hung-ying Tyan
82b4003871 am df08c2f0: am 692cac9f: SipHelper: add debug log for challenge responses.
Merge commit 'df08c2f03e7cf7be7002d34efe8e4e8d24e406de'

* commit 'df08c2f03e7cf7be7002d34efe8e4e8d24e406de':
  SipHelper: add debug log for challenge responses.
2010-10-11 18:59:05 -07:00
Jean-Baptiste Queru
40e7a62789 am 6d1321f0: am 65f23e71: Merge "Corrected visibility reporting error in WindowManager"
Merge commit '6d1321f02f8e8c201469f17a7a62a4d063821b9a'

* commit '6d1321f02f8e8c201469f17a7a62a4d063821b9a':
  Corrected visibility reporting error in WindowManager
2010-10-11 18:58:35 -07:00
Jean-Baptiste Queru
057c13bcce am c43189e7: am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Merge commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3'

* commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3':
  Hold partial wakelock during shutdown to avoid entering sleep
2010-10-11 18:58:25 -07:00
Jean-Baptiste Queru
81bef57f6d am 5bf55c80: am 0e430ccc: Merge "Telephony: Fix radio state printing"
Merge commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f'

* commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f':
  Telephony: Fix radio state printing
2010-10-11 18:57:54 -07:00
Jean-Baptiste Queru
6a443f2ee1 am d54a97a0: am fb1e5529: Merge "Fix time zone info in kernel is nothing after reboot"
Merge commit 'd54a97a0efc5cdd8088a277b0e6787ea24711e0c'

* commit 'd54a97a0efc5cdd8088a277b0e6787ea24711e0c':
  Fix time zone info in kernel is nothing after reboot
2010-10-11 18:57:43 -07:00
Jean-Baptiste Queru
a081fa662b am 9dfa3037: am 334a4d84: Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
Merge commit '9dfa30375e66ae533e253f5287a8c8e293187e19'

* commit '9dfa30375e66ae533e253f5287a8c8e293187e19':
  Telephony: Remove unused mRuimFileHandler reference from CDMAPhone
2010-10-11 18:57:33 -07:00
Gilles Debunne
8245acaab6 am 1457bb0e: am 6b8bdaa9: New AppsPermission and market style
Merge commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683'

* commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683':
  New AppsPermission and market style
2010-10-11 18:57:14 -07:00
Jeff Brown
9c9f1a3ba1 Track input state when transferring touch focus.
Copies the input state to the destination window and sends synthesic
cancelation events to the source window.

Change-Id: Ia75820b0d756ed5d6cd22dce7830251ac85141ed
2010-10-11 18:32:20 -07:00
Jeff Brown
4231124c9d Merge "Fix an event injection bug when the policy is bypassed." 2010-10-11 18:15:38 -07:00
Romain Guy
d5d2b7382c Merge "Don't draw fully transparent views/primitives." 2010-10-11 18:00:43 -07:00
Romain Guy
dbc26d2ba1 Don't draw fully transparent views/primitives.
Change-Id: Icd7d8ef1f57b51a24faf32f7004125e6300d4fdc
2010-10-11 17:58:29 -07:00
Jeff Brown
e20c9e0264 Fix an event injection bug when the policy is bypassed.
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.

Cherry pick of b931a1b4 from gingerbread into master.

Change-Id: I700a5f07b8b227878cea9437a289a45a245c0424
2010-10-11 17:54:12 -07:00
Jean-Baptiste Queru
02241ab292 am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc'

* commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc':
  Support showing "Cold" battery health.
2010-10-11 17:49:42 -07:00
Jean-Baptiste Queru
76f8688e9b am 779d1778: am bd1454f5: Merge "Include debugger connection status in error entry"
Merge commit '779d1778b6147ee1b57428af234d1498a26f031e'

* commit '779d1778b6147ee1b57428af234d1498a26f031e':
  Include debugger connection status in error entry
2010-10-11 17:49:28 -07:00
David Brown
a23935ab33 am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3'

* commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3':
  Don't manually create CallerInfo objects from SipPhone
2010-10-11 17:48:47 -07:00
Mike Lockwood
986d170182 am 1bdba9fa: am 2f77c3e4: Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
Merge commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61'

* commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61':
  GPS: Fix another race condition in GPS HAL initialization
2010-10-11 17:48:35 -07:00
Justin Ho
e13fc12941 am 90390e69: (-s ours) am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
Merge commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf'

* commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf':
  Updated media playback controls, unlock screen, misc framework assets
2010-10-11 17:48:24 -07:00
Vasu Nori
182e5cf105 am a23964f9: am b8f7a483: Merge "bug:3082865 don\'t use IN to construct sql to delete downloads" into gingerbread
Merge commit 'a23964f9a1df7fb2f18e350fb4215933674f9991'

* commit 'a23964f9a1df7fb2f18e350fb4215933674f9991':
  bug:3082865 don't use IN to construct sql to delete downloads
2010-10-11 17:43:34 -07:00
Brad Fitzpatrick
d532d8d8c1 am ca1db5ae: am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.
Merge commit 'ca1db5ae68971779fd8af83c908128849f470ae0'

* commit 'ca1db5ae68971779fd8af83c908128849f470ae0':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.
2010-10-11 17:43:06 -07:00
Xavier Ducrohet
49bbd66251 am ceb3aae3: am 4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread
Merge commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d'

* commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d':
  Avoid pre-processing images when they won't be used
2010-10-11 17:42:54 -07:00
Jeff Brown
dd8b0c9040 am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '41aabeb51305d19747687f246080f44fc2a74435'

* commit '41aabeb51305d19747687f246080f44fc2a74435':
  Added more robust tracking and cancelation of events.
2010-10-11 17:42:30 -07:00
Stephen Hines
5d3f6073bf Merge "Support for unsigned long and unsigned long long." 2010-10-11 17:32:25 -07:00
Jeff Brown
f2e0681ada am 1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." into gingerbread
Merge commit '1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp

* commit '1da8d4d1697cec871dea8c30dad67e90db10bde6':
  Fix an event injection bug when the policy is bypassed.
2010-10-11 17:26:51 -07:00