Commit Graph

37934 Commits

Author SHA1 Message Date
Dianne Hackborn
4968f28b84 Merge "New broadcast telling when an app is fully removed." 2011-08-11 11:35:07 -07:00
Marco Nelissen
5160988bf6 Merge "Add Bluetooth SCO test app" 2011-08-11 11:10:44 -07:00
Chet Haase
33aecb24c1 Merge "Fix Recent Apps jumping artifact" 2011-08-11 11:10:32 -07:00
Ben Murdoch
fb95d403d0 Merge "Allow fractional and signed input for number fields." 2011-08-11 10:29:56 -07:00
Robert Greenwalt
a36ac5b02c Merge "Remove default routes for non-default networks." 2011-08-11 09:55:08 -07:00
Dave Burke
544ea69c90 Merge "Revert "error out when SurfaceTexture APIs are called while not connected"" 2011-08-11 07:21:19 -07:00
Dave Burke
4925ee11f9 Revert "error out when SurfaceTexture APIs are called while not connected"
This reverts commit a04cda9986366ab480ad8008c4d923271b05d78e.

Conflicts:

	include/gui/SurfaceTexture.h
	libs/gui/SurfaceTexture.cpp

Change-Id: Ib655016462c496ee2a27f7cb33a6e8b18cfe684a
2011-08-11 15:13:19 +01:00
Daniel Sandler
7332e8202b Merge "Remove logspew." 2011-08-11 05:17:14 -07:00
Daniel Sandler
298b779f41 Merge "Remove obsolete assets." 2011-08-11 05:17:09 -07:00
Daniel Sandler
a133d64206 Merge "Clean up some effects in the phone notification panel." 2011-08-11 05:17:03 -07:00
Daniel Sandler
a1987fa263 Merge "Fix fullScreenAlert test." 2011-08-11 05:16:53 -07:00
Kristian Monsen
45e323c87d Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2" 2011-08-11 03:02:29 -07:00
Adam Powell
6ccc095fd6 Merge "Fix bug 5122319 - When action bar tabs run out of space they should collapse in to a spinner." 2011-08-10 23:29:57 -07:00
Mathias Agopian
3477588d13 Merge "Read leftover parcel data when a parceled Surface is found in the cache." 2011-08-10 19:45:34 -07:00
Mathias Agopian
f440f670a4 Merge changes I5174a6ec,I1f8538b6,Idb71fdcf
* changes:
  fix a crasher in SurfaceTexture::updateTexImage()
  rework dequeueBuffer()'s main loop.
  error out when SurfaceTexture APIs are called while not connected
2011-08-10 19:40:48 -07:00
Mathias Agopian
b2928c9068 Merge "Fix typos and use new HAL_PRIORITY_URGENT_DISPLAY constant" 2011-08-10 19:40:15 -07:00
Daniel Sandler
8cc43181c6 Merge "Subtract the navigation bar from DisplayMetrics." 2011-08-10 18:54:20 -07:00
Chia-chi Yeh
0b5a003b83 Merge "Unhide APIs for user space VPN." 2011-08-10 17:42:45 -07:00
Chia-chi Yeh
1f9930ed6d Merge "VPN: remove unused protected intent." 2011-08-10 17:42:30 -07:00
Bjorn Bringert
83788a04ef Merge "Add PendingIntent extra for WEB_SEARCH intents" 2011-08-10 17:39:08 -07:00
Mathias Agopian
8e19c2e97e fix a crasher in SurfaceTexture::updateTexImage()
we now make sure to drain the buffer queue on disconnect.
this happens only when in synchrnous mode. in async mode
we clear all buffers except the head of the queue.

for extra safety we also catch the null pointer
in updateTexImage (which should  never happen) and return
an error.

Bug: 5111008

Change-Id: I5174a6ecbb0de641c6510ef56a611cbb4e9e1f59
2011-08-10 17:35:52 -07:00
Mathias Agopian
2560d14ce8 rework dequeueBuffer()'s main loop.
this simplifies the code a bit and also makes sure
we reevaluate mAbandoned and mConnectedApi each time
we come back from waiting on mDequeueCondition

Change-Id: I1f8538b62ad321b51ed79d953b700036daba796d
2011-08-10 17:35:26 -07:00
Mathias Agopian
ef51b99219 error out when SurfaceTexture APIs are called while not connected
- also log a warning when freeAllBuffers is called with a non empty buffer queue
- rename freeAllBuffers to freeAllBuffersLocked

Change-Id: Idb71fdcf233b9ccae62d5a2a7c3c4bad2501d877
2011-08-10 17:33:46 -07:00
Jeff Brown
94b7c1b511 Merge "Add input system to Watchdog. Bug: 5094994" 2011-08-10 17:28:15 -07:00
Jeff Brown
78a8a5b31f Merge "Fix getSwitchState and others to check bitmasks. Bug: 5149443" 2011-08-10 17:28:09 -07:00
Jeff Brown
cc0692b3ee Merge "Use BTN_TOUCH or BTN_TOOL_* to determine if touch active. Bug: 5064702" 2011-08-10 17:28:05 -07:00
Jeff Brown
dc67136bd5 Merge "Update keymaps. Bug: 5069142" 2011-08-10 17:27:59 -07:00
Amith Yamasani
8294646593 Merge "Pass in the title of the preference as a title for the ringtone picker dialog." 2011-08-10 17:12:05 -07:00
Winson Chung
41a16ef2a1 Merge "Fixing screenshot timestamp (5147168)" 2011-08-10 16:23:52 -07:00
Amith Yamasani
3b9b18477b Merge "Accessibility and silent mode changes to Volume Panel." 2011-08-10 16:17:03 -07:00
Irfan Sheriff
9dcf98f4da Merge "Ensure interface down before wpa_supplicant start" 2011-08-10 16:04:50 -07:00
Marco Nelissen
df53b72c2b Merge "Check pids instead of IBinders" 2011-08-10 15:48:53 -07:00
Kenny Root
b78a455cda Merge "Manifest digest stored during package scanning" 2011-08-10 15:39:41 -07:00
Gilles Debunne
2b0ae6f2ad Merge "SuggestionEnabled flag enforced in ActionPopup" 2011-08-10 15:17:40 -07:00
Gloria Wang
31269f72f4 Merge "To reduce the bytes need to be buffered before start playing the streaming video. We might revert this change if too many spinnings were introduced. For bug 4448008." 2011-08-10 14:52:36 -07:00
Kenny Root
bc4970007f Merge "Eliminate warnings from PackageParser" 2011-08-10 14:28:13 -07:00
Jeff Brown
9f213739b9 am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
* commit 'ca97671e2b74ed31b5bef6fd0b39e489f1ec5f51':
  Fix getSwitchState according to device capabilities.
2011-08-10 13:59:44 -07:00
Jeff Brown
04eb1755a2 am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
* commit '7e79b9aad85db332d334f8bc1625bf46f030830f':
  Support wrapping app processes to inject debug instrumentation. Bug: 4437846
2011-08-10 13:59:41 -07:00
Jeff Brown
38b77d4373 am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
* commit '6f5a837c9c4a55c82111c6cd5af6055b63fcb5a9':
  Fix getSwitchState according to device capabilities.
2011-08-10 13:56:33 -07:00
Jeff Brown
4af616cb5a am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
* commit 'dbff91077ddf437b62794e077d2ce9e10fff8170':
  Support wrapping app processes to inject debug instrumentation. Bug: 4437846
2011-08-10 13:56:31 -07:00
Jeff Brown
c6d6863c9b Merge "Fix getSwitchState according to device capabilities." 2011-08-10 13:42:03 -07:00
Jeff Brown
091c0f7ece Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 2011-08-10 13:41:36 -07:00
Andreas Huber
4a058dc065 Merge "When using "secure input buffer mode" we instantiate a different OMX component" 2011-08-10 13:03:29 -07:00
Andreas Huber
d373933109 Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode."" 2011-08-10 13:03:24 -07:00
Dianne Hackborn
617d0667b9 Merge "New extended Intent protcols for installing/uninstalling apps." 2011-08-10 12:34:21 -07:00
Daniel Sandler
aebc0cf48f Merge "Initial support for notification panel access in keyguard." 2011-08-10 12:23:50 -07:00
Irfan Sheriff
fe7a762291 Merge "Add firmware reload support for P2P" 2011-08-10 12:19:58 -07:00
James Dong
fe5da4456d Merge "Fix initial 0 duration video sample in the recorded videos" 2011-08-10 11:47:38 -07:00
Mike Lockwood
7e80029c4e Merge "Use video/webm mime type for WEBM files" 2011-08-10 10:28:25 -07:00
Mike Lockwood
03cd79f29d Merge "MediaScanner: Disable bulk inserts" 2011-08-10 10:28:18 -07:00