Commit Graph

22772 Commits

Author SHA1 Message Date
Mathias Agopian
09e5687757 am 3754d0cc: am d0528b74: Merge "deliver invalidate messages AFTER other messages" into gingerbread
Merge commit '3754d0ccc7ba07fd867d3d28e6493e84ce0a139d'

* commit '3754d0ccc7ba07fd867d3d28e6493e84ce0a139d':
  deliver invalidate messages AFTER other messages
2010-10-12 13:56:58 -07:00
Joe Onorato
a66d342f17 am 5be893a7: am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread
Merge commit '5be893a71aa72f54660496dd01cfad66adb86b8f'

* commit '5be893a71aa72f54660496dd01cfad66adb86b8f':
  Don't throw when userActivity fails because of the permission check.
2010-10-12 13:22:41 -07:00
Brad Fitzpatrick
6e98906721 am 2af4c51e: am 6bb7a4a6: Go one day into 1970 for timezone code.
Merge commit '2af4c51e9a82848e3efce4621559a69fda965665'

* commit '2af4c51e9a82848e3efce4621559a69fda965665':
  Go one day into 1970 for timezone code.
2010-10-12 13:22:27 -07:00
Romain Guy
7d3d01000a Merge "Simplify black texture fragment shader." 2010-10-12 13:15:44 -07:00
Brad Fitzpatrick
987c90d7a1 resolved conflicts for merge of 14d151bf to master
Change-Id: Ib1ac9acfd6dc71b5fa4e1456a056d1e9dee65fda
2010-10-12 13:12:18 -07:00
Kenny Root
2eeec06971 Merge "Add API to check for emulated external storage" 2010-10-12 12:45:46 -07:00
Adam Powell
62b09b91d4 Merge "Holo fixes" 2010-10-12 12:02:11 -07:00
Romain Guy
360fac0ceb Merge "Fix invisible views issue in Launcher." 2010-10-12 11:55:50 -07:00
Mathias Agopian
2669131aed 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
d1c53a1961 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
3c7c64e9c4 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
4c3ce7b575 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
0fbfa9d1fb Merge "MTP: allow renaming directories" 2010-10-12 11:42:33 -07:00
Xia Wang
3d74f80e33 Merge "resolved conflicts for merge of d4e3bf4d to master" 2010-10-12 11:07:11 -07:00
Xia Wang
00a0124123 resolved conflicts for merge of d4e3bf4d to master
Change-Id: I41c0ae2b3f557f84b25c39e247894f66a4e7e702
2010-10-12 11:05:54 -07:00
Romain Guy
3b996c96e4 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
f5afdde5e7 Merge "Remove the unused UrlRendererService" 2010-10-12 10:57:15 -07:00
Romain Guy
beddf2bab0 Merge "Don't set hwAccelerated=true when libhwui is not present." 2010-10-12 10:36:35 -07:00
Mike Lockwood
2059fcb78a Merge "MTP: Add support for renaming files" 2010-10-12 09:46:14 -07:00
Alex Sakhartchouk
f097f64236 Merge "Fixing refcounting debug statements that've gotten bitrotten." 2010-10-12 09:40:23 -07:00
Jean-Baptiste Queru
0ed3f5dead resolved conflicts for merge of e69f1f1a to master
Change-Id: I32b34e4f6ae83ff40398c6e9e2881af12abc4aa8
2010-10-12 09:23:10 -07:00
Bjorn Bringert
52ebb2e4b4 Merge "Move SyncStateContentProviderHelper to frameworks/ex" 2010-10-12 02:31:42 -07:00
Wu-cheng Li
71ea580533 Merge "Fix camera display orientation." 2010-10-12 01:41:59 -07:00
Jeff Brown
3a11ca5c89 Merge "Track input state when transferring touch focus." 2010-10-11 20:29:36 -07:00
Hung-ying Tyan
807cb815ac 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
4e611bfe80 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
18dff56d8b 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
f2f37b626f 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
9183b776db 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
3729bed055 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
abc88a8aa5 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
b6702e5972 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
a2bfe97d34 Merge "Fix an event injection bug when the policy is bypassed." 2010-10-11 18:15:38 -07:00
Romain Guy
fe1df66529 Merge "Don't draw fully transparent views/primitives." 2010-10-11 18:00:43 -07:00
Jeff Brown
33d54ce97d 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
32e58223c3 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
199492337c 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
cd3115b1aa 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
b2e0b981d1 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
220ee10a8d 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
9f90cffa30 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
9a0618cc6e 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
f2d6b0f778 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
d129348647 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
1cd70b912d Merge "Support for unsigned long and unsigned long long." 2010-10-11 17:32:25 -07:00
Romain Guy
1ad02eb3cb Merge changes I9a5e01bc,If1caee31
* changes:
  Optimize GLSL shaders.
  Improve performance of linear gradients.
2010-10-11 17:13:32 -07:00
Stephen Hines
24ae58d2be Merge "Test exported "long" type." 2010-10-11 15:14:36 -07:00
Alex Sakhartchouk
4b425895f1 Merge "Update allocation from bitmap. GL attribute cleanup in type." 2010-10-11 15:03:29 -07:00
Mike Lockwood
ff19a1fc93 Merge "MTP: Include size of 12 byte header in packet size for GetObject data packet" 2010-10-11 14:37:06 -07:00
Mathias Agopian
2e109a8666 am d0528b74: Merge "deliver invalidate messages AFTER other messages" into gingerbread
Merge commit 'd0528b74b6de87c415ea498095e142d52c68875b' into gingerbread-plus-aosp

* commit 'd0528b74b6de87c415ea498095e142d52c68875b':
  deliver invalidate messages AFTER other messages
2010-10-11 14:17:25 -07:00