49767 Commits

Author SHA1 Message Date
Daniel Sandler
0c19aaaebb Merge "On-screen navigation bar (separate from the status bar)." 2011-05-04 11:26:38 -07:00
Andreas Huber
65b9605976 Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Change-Id: I3dc50e6e447668ac8b8c2956329352635750a2cd
related-to-bug: 4381047
2011-05-04 09:48:46 -07:00
Daniel Sandler
d108538546 Merge "Start honeyphoning the notification panel." 2011-05-04 09:00:18 -07:00
Gloria Wang
4f55af7ba6 Merge "Initial CL for the timed text support: - Add support for MP4 timed text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever" 2011-05-04 09:00:15 -07:00
Daniel Sandler
b48e74b10c Start honeyphoning the notification panel.
Notifications on phones should look much more like Honeycomb
now, including large icon and veto support.

And less crashing.

Bug: 4322305
Change-Id: Ibde6f66fbae1c8d3167085f7b0fd79118485f05c
2011-05-04 11:17:07 -04:00
Bjorn Bringert
d58efd38e7 Merge "Check for exceptions before calling back into Java" 2011-05-04 02:56:04 -07:00
Adam Powell
e04074a39c Merge "Fix bug 4361642 - Action menu unresponsive after orientation change" 2011-05-03 21:05:38 -07:00
Adam Powell
31bb97d240 Fix bug 4361642 - Action menu unresponsive after orientation change
Through invalidating panel menus and action bar initialization it was
possible for instance state restoration to throw out a new menu
already in use. Invalidate the menu if it already exists instead. The
saved instance state will be applied later if a relevant panel menu is
shown.

Change-Id: I6bad7640ecb8d2f5f8ea658e1c68b07d52d108b9
2011-05-03 21:03:24 -07:00
Mathias Agopian
a5720192fe Merge "Fix a race in SurfaceFlinger that could cause layers to be leaked forever." 2011-05-03 20:46:38 -07:00
Mathias Agopian
6dcb1557ef Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
The transaction flags were atomically read-and-cleared to determine if
a transaction was needed, in the later case, mStateLock was taken to
keep the current state still during the transaction. This left a small
window open, where a layer could be removed after the transaction flags
were checked but before the transaction was started holding the lock.
In that situation eTraversalNeeded would be set but only seen during the
next transaction cycle; however, because we're handling this transaction
(because of another flag) it will be commited, "loosing" the information
about the layer being removed -- so when the next transaction cycle due
to eTraversalNeeded starts, it won't notice that layers have been removed
and won't populated the ditchedLayers array.

Change-Id: Iedea9e25fee8dd98a0c5bd5ad41a20fcadf75b47
2011-05-03 20:44:51 -07:00
Adam Powell
f3cd1d957c Bug 4269063 - Populate contentdescription in action bar
home/up and action menu

Change-Id: Ia09d78d9d37848621e025b9af93a92cfd3bb8dc7
2011-05-03 19:43:55 -07:00
Adam Powell
e409851954 Merge "Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28" 2011-05-03 17:33:02 -07:00
Adam Powell
d1f4207ba5 Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28
Change-Id: Icfcd8c2aadd0fb9e49296b8318858317407e1b7f
2011-05-03 17:30:48 -07:00
Robert Ly
e98c27e5e4 am 79eb7876: am 88741823: am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
* commit '79eb78769c8ecd92624f0171d9f22d95fc093b00':
  Doc change: fixing minor bug for xml resources bug 4376713
2011-05-03 17:03:21 -07:00
Glenn Kasten
f639533484 am a98bcdf6: am 3b698d18: am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
* commit 'a98bcdf61dda9d64b4f584ce34c76df79409916a':
  Account for race condition when attaching HDMI.
2011-05-03 17:03:18 -07:00
Robert Ly
79eb78769c am 88741823: am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
* commit '88741823a67fd8246b3926464bfaa2081b330f40':
  Doc change: fixing minor bug for xml resources bug 4376713
2011-05-03 16:59:34 -07:00
Glenn Kasten
a98bcdf61d am 3b698d18: am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
* commit '3b698d181b7f165c9b31f7d74be19a5ed7575347':
  Account for race condition when attaching HDMI.
2011-05-03 16:59:31 -07:00
Robert Ly
88741823a6 am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
* commit '7c2d14d59637cfb06ebcfbb091541cebd131fc6a':
  Doc change: fixing minor bug for xml resources bug 4376713
2011-05-03 16:57:52 -07:00
Glenn Kasten
3b698d181b am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
* commit '9d8c6215d1aedb1e9f2e10c63e737427f13be884':
  Account for race condition when attaching HDMI.
2011-05-03 16:57:45 -07:00
Robert Ly
7c2d14d596 Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 2011-05-03 16:54:21 -07:00
Robert Ly
0cc4b8a787 Doc change: fixing minor bug for xml resources
bug 4376713

Change-Id: I4c969810eaaf053f8326721b71fbe494b542082d
2011-05-03 16:50:16 -07:00
Glenn Kasten
9d8c6215d1 Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 2011-05-03 16:46:12 -07:00
Gloria Wang
c6091ddd3a Initial CL for the timed text support:
- Add support for MP4 timed text
- Add API for app to turn on/off a text track
- Add timed text metadata(language) in the MediaMetadataRetriever

Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94
2011-05-03 16:41:17 -07:00
Iliyan Malchev
b2a153adc9 frameworks/base: android_native_buffer_t -> ANativeWindowBuffer
Change-Id: Idc2eabaa805bb6d308ebb315872623f28d428417
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 16:40:14 -07:00
Iliyan Malchev
be0cc36525 frameworks/base: move ANativeWindow/android_native_buffer_t out
These definitions have been moved to system/core.

Change-Id: I021b6b5f2fd72d538b5ccdcb33860ebd3004d9ad
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 16:39:54 -07:00
Iliyan Malchev
bf8b45cd15 Merge changes I5c61ac40,I67c40a3c,I3e2ddd01
* changes:
  frameworks/base: switch CameraService to a HAL module
  frameworks/base: make the ANativeWindow query() method const
  frameworks/base: include system/core header camera.h in Camera.h
2011-05-03 16:38:07 -07:00
Wink Saville
ec9b5d17af am ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
* commit 'ee081bf5ee936396a89d5bd2b29487047b260f49':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
2011-05-03 16:36:36 -07:00
Mathias Agopian
50a2f8f661 Merge "Fix a race-condtion in SurfaceFlinger that could lead to a crash." 2011-05-03 16:34:06 -07:00
Wink Saville
ee081bf5ee am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
* commit '3ed0a1ec7aa6364c236721a1bd29fd196f259cba':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
2011-05-03 16:33:08 -07:00
Mathias Agopian
5fa7ad6fa1 Fix a race-condtion in SurfaceFlinger that could lead to a crash.
Client::mLayers could be accessed from different threads.
On one side from Client::attachLayer() which is currently
called from a binder thread; on the other side from
Client::detachLayer() which is always called from the main
thread.

This could lead to a corruption of Client::mLayers.

We fix this issue by adding an internal lock to Client.

Change-Id: Ib1317d7750ed5030e6f577efe34b69fc10198bd3
2011-05-03 16:21:41 -07:00
Wink Saville
3ed0a1ec7a Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE 2011-05-03 16:19:58 -07:00
Conley Owens
1c6afcbf1f am 2d40bf91: am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
* commit '2d40bf91e6ad71505ec84743c5ad0b854ecf5928':
  Removing dead store; it was likely a relict of debuging code.
2011-05-03 16:19:53 -07:00
Conley Owens
2d40bf91e6 am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
* commit 'eac835e52e8378b33a2b34b7edb803290154588d':
  Removing dead store; it was likely a relict of debuging code.
2011-05-03 16:14:31 -07:00
Iliyan Malchev
a269b87bd7 frameworks/base: switch CameraService to a HAL module
This patch changes CameraService to load a camera HAL module, instead of
linking directly against a library that implements the CameraHardwareInterface
class.

CameraHardwareInterface no longer defines the API to the camera HAL.  Instead,
this is now in HAL header hardware/camera.h.  We keep CamerHardwareInterface as
a class local to CameraService, which wraps around the new HAL calls.  In the
future, we may remove this class entirely and have CameraService call the HAL
methods directly.

Change-Id: I5c61ac40078fc0b50bbac5881a556fe6c8837641
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 15:49:40 -07:00
Iliyan Malchev
4d7c1ce651 frameworks/base: make the ANativeWindow query() method const
query() does not modify the object's data, so it needs to be a const method

Change-Id: I67c40a3c865461e6f1cc2193fd2d74286ff6ac8f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 15:49:40 -07:00
Iliyan Malchev
9c7ac0d142 frameworks/base: include system/core header camera.h in Camera.h
We define struct CameraInfo in this camera/Camera.h, even though an identical
struct camera_info is defined in hardware/camera.h (but not in
hardware/camera_defs.h).  We may not export struct definitions from the HAL
into headers which may find their way into the NDK.

This commit also renames FRAME_CALLBACK_FLAG_xxx to CAMERA_FRAME_CALLBACK_xxx.

Change-Id: I3e2ddd01d61bf5371ff2fc1a397995e0f1ee11f8
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 15:49:39 -07:00
Mathias Agopian
9d216f7b0e Merge "improve documentation for the ROTATION_VECTOR sensor" 2011-05-03 15:36:23 -07:00
Mathias Agopian
557975c2b5 Merge "Add documentation for Sensor.TYPE_PRESSURE" 2011-05-03 15:25:42 -07:00
Adam Powell
0d42f17f5e Merge "Fix bug 4345702 - update action bar tab views when the Tab object is updated" 2011-05-03 14:55:54 -07:00
Jason Sams
629b565162 Merge "Try fixing auto data inlining again." 2011-05-03 14:52:22 -07:00
Adam Powell
0d8ec1d739 Fix bug 4345702 - update action bar tab views when the Tab object is
updated

Also fix a bug with visibility of split action bar views.

Change-Id: Iadd63d5e9b6cb9debab0f7a777e424e4c4807a13
2011-05-03 14:50:08 -07:00
Stephen Hines
ceae02e2c7 Merge "Clean up use of rsSetObject/rsClearObject." 2011-05-03 14:32:11 -07:00
Ramesh Sudini
0e7b5a0287 IMS: Provide net_admin permission so that IPSec could be configured/used.
IMS configures the security database in kernel with keys generated from ISIM.

Change-Id: Iae9fb85f286ff2a627369d784a127bf7d4d8f4b3
2011-05-03 13:46:08 -07:00
Dan Morrill
b969d2d9c1 am e21f3764: (-s ours) am 75c66458: am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
* commit 'e21f3764343ba3b077c6be3cad568ab9ecea85a7':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
2011-05-03 13:42:02 -07:00
Dan Morrill
e21f376434 am 75c66458: am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
* commit '75c664582c5ce5d94826f37cb725b447a4d62c50':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
2011-05-03 12:46:20 -07:00
Dan Morrill
75c664582c am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
* commit '8325c3a89197e47cfc2eeb4117c927fb8cb91630':
  Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
2011-05-03 12:26:16 -07:00
Conley Owens
eac835e52e am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
* commit '9c4ba2580e2ef582747cce2960804a2a5e4b776e':
  Removing dead store; it was likely a relict of debuging code.
2011-05-03 12:07:19 -07:00
Eino-Ville Talvala
3723396c7a Merge "Add an auto-exposure lock feature to the Camera API." 2011-05-03 11:07:33 -07:00
Eric Fischer
3e456fa745 Merge "Import revised translations." 2011-05-03 10:57:54 -07:00
Wink Saville
f45f13bd15 am 3165f1a8: am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE
* commit '3165f1a8eb707b36a6b2c66379c3fde85d9cc2fd':
  Make DataConnection asynchronous.
2011-05-02 23:46:03 -07:00