4314 Commits

Author SHA1 Message Date
Kenny Root
ab275bb637 am 1c67b7af: am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread
Merge commit '1c67b7af0147080de807db3cc564899db85b43a8'

* commit '1c67b7af0147080de807db3cc564899db85b43a8':
  Grant URI permissions to the MCS
2010-10-12 16:40:47 -07:00
Joe Onorato
c88a1f955c am 14854820: am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit '14854820eac895a925791fb41ccd330447fd4f02'

* commit '14854820eac895a925791fb41ccd330447fd4f02':
  Add a configuration option to turn on the screen when you unplug the device.
2010-10-12 16:27:22 -07:00
Axel Haslam
49016d6cd7 BatteryService: Set bool to true if sysfs entry is not 0
For the musb to recognized as online, the musbOnline value
has to be set. The battery driver sets the online property
of the sysfs as "3" when the charger type is USB.

The way the current code is, if the value is not 1,
musbOnline would be false and the menu to mount the
sdcard on the pc would not pop-up.

Since the linux driver returns 0 if the cable is not
connected, and 3 if the cable is connected, we should
set the boolean variable to 0 only if the sysfs value
is 0, otherwise we set it to true.

Change-Id: I538d8de446e7ea4f620ffcce156a57cf56b5a4e5
Signed-off-by: Axel Haslam <axelhaslam@ti.com>
2010-10-12 17:32:26 -05:00
Andy Stadler
8a703c772e am 8e2be267: Add versionCode and versionName to dumpsys packages
Merge commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp

* commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58':
  Add versionCode and versionName to dumpsys packages
2010-10-12 15:25:34 -07:00
Andy Stadler
8e2be267f5 Add versionCode and versionName to dumpsys packages
bug: 3090491
Change-Id: If116baaeb83bd282c5c5534fde6248f19830a71c
2010-10-12 15:05:06 -07:00
Joe Onorato
9a12a3c8d4 am ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp

* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
  Remove dead code, and make the animation a setting.
  turn off the electron beam
2010-10-12 14:46:23 -07:00
Chris Tate
b8203e9718 Pass the starting touch point in the DRAG_STARTED message
Fixes bug 3089251

Change-Id: I072742dc6c5745083cdac8dcfa19fb1f2bbbf404
2010-10-12 14:23:21 -07:00
Joe Onorato
b08a1af667 Remove dead code, and make the animation a setting.
When we don't do the brightness fade, turn off the electron beam instead.

Change-Id: I76513387c4fb420a67e59e005f6e8c3bc72f7f08
2010-10-12 14:16:11 -07:00
Mathias Agopian
aab758e879 turn off the electron beam
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
2010-10-12 14:16:11 -07:00
Chris Tate
1ab5de7f21 am a75803e9: am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread
Merge commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2'

* commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2':
  Temporarily turn on backup/restore debug logs
2010-10-12 13:57:20 -07:00
Mathias Agopian
ef31d7d00e am 5d477279: am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
Merge commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78'

* commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78':
  fix a bug where FLIP_H would do a 180 rotation
2010-10-12 13:57:09 -07:00
Mathias Agopian
4fc01e9aae 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
7031e7a60d 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
5e6338d4a8 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
Brad Fitzpatrick
5fdc0c7397 resolved conflicts for merge of 14d151bf to master
Change-Id: Ib1ac9acfd6dc71b5fa4e1456a056d1e9dee65fda
2010-10-12 13:12:18 -07:00
Kenny Root
e28c8f286d Merge "Add API to check for emulated external storage" 2010-10-12 12:45:46 -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
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
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
Wu-cheng Li
7b76bed1ee Merge "Fix camera display orientation." 2010-10-12 01:41:59 -07:00
Jeff Brown
4b255a2304 am 03aa28fb: Merge "Improve the input policy handling a bit." into gingerbread
Merge commit '03aa28fb36589a3d601be08e75c08a24c4344d6f' into gingerbread-plus-aosp

* commit '03aa28fb36589a3d601be08e75c08a24c4344d6f':
  Improve the input policy handling a bit.
2010-10-12 01:04:16 -07:00
Wu-cheng Li
b0f7d95bf8 Fix camera display orientation.
bug:3036262
Change-Id: I6fc3dc381fcfaceba09fd5bd14afb85045b3d676
2010-10-12 15:52:44 +08:00
Jeff Brown
3122e4488a Improve the input policy handling a bit.
Fixed some issues with Monkeys turning off their own screens.  Ook ook!
Added some more comments to explain what's going on.

Change-Id: Id2bc0466161a642a73ef7ef97725d1c81e984b12
2010-10-12 00:16:14 -07: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
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
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
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
Mike Lockwood
f7b7330e71 GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
Change-Id: Ic934c478f0eb6c6d368caaf41aec8235d329ef34
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-11 21:27:06 -04:00
Jeff Brown
4231124c9d Merge "Fix an event injection bug when the policy is bypassed." 2010-10-11 18:15:38 -07:00
Mathias Agopian
cd54dc26f7 Use the context_priority extension when present.
Change-Id: I12eadf1e32d576de5d811fba44afa73263e13eef
2010-10-11 18:01:00 -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
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
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
Kenny Root
8bb7a1dfbb am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp

* commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45':
  OBB: rearrange to be entirely asynchronous
2010-10-11 17:31:06 -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
Kenny Root
1c67b7af01 am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread
Merge commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e' into gingerbread-plus-aosp

* commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e':
  Grant URI permissions to the MCS
2010-10-11 17:26:07 -07:00
Kenny Root
b4de3dca96 Merge "OBB: rearrange to be entirely asynchronous" into gingerbread 2010-10-11 17:24:54 -07:00
Kenny Root
af9d667ccf OBB: rearrange to be entirely asynchronous
Rearrange structure of MountService handling of OBBs to be entirely
asynchronous so we don't rely on locking as much. We still need the
locking to support dumpsys which has been improved to output all the
data structures for OBBs.

Added more tests to cover more of the error return codes.

Oh and fix a logic inversion bug.

Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
2010-10-11 17:22:03 -07:00
Jeff Brown
1da8d4d169 Merge "Fix an event injection bug when the policy is bypassed." into gingerbread 2010-10-11 16:27:36 -07:00
Jeff Brown
b931a1b418 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.

Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
2010-10-11 16:26:13 -07:00
Kenny Root
a4e95dfea4 Merge "Grant URI permissions to the MCS" into gingerbread 2010-10-11 15:49:30 -07:00
Joe Onorato
fdb39feedd Merge "Fix sometimes mExpandedView will appear while screen transforming." 2010-10-11 15:44:14 -07:00
Joe Onorato
14854820ea am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp

* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
  Add a configuration option to turn on the screen when you unplug the device.
2010-10-11 15:22:30 -07:00
Joe Onorato
c0ad216c8e Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread 2010-10-11 15:19:47 -07:00
Joe Onorato
6d74765662 Add a configuration option to turn on the screen when you unplug the device.
Bug: 3068624
Change-Id: I7366ece2528b31feee920f4600a475e81a0f3709
2010-10-11 15:16:28 -07:00
Kenny Root
1112857632 Grant URI permissions to the MCS
When the PackageManagerService is asked to install from a URI, it might
be explicitly granted the permission to read from the URI content
provider. We need to pass along these permissions to the
MediaContainerService (DefaultContainerService) to ensure the MCS can
read from the content provider.

Change-Id: Ie7ddaeb638af82b60792a4c3f8c99e1e8eef1916
2010-10-11 15:11:12 -07:00
Chris Tate
a75803e950 am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread
Merge commit '0a7892367f46e3653e9857195ec19356f848b7f8' into gingerbread-plus-aosp

* commit '0a7892367f46e3653e9857195ec19356f848b7f8':
  Temporarily turn on backup/restore debug logs
2010-10-11 14:45:22 -07:00