ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,555 Commits 2 Branches 0 Tags 54 MiB
a727fab344
Commit Graph

33555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
a727fab344 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
Bjorn Bringert
3ede79dc28 Merge "Check for exceptions before calling back into Java" 2011-05-04 02:56:04 -07:00
Adam Powell
21c8466ef5 Merge "Fix bug 4361642 - Action menu unresponsive after orientation change" 2011-05-03 21:05:38 -07:00
Mathias Agopian
c83110d464 Merge "Fix a race in SurfaceFlinger that could cause layers to be leaked forever." 2011-05-03 20:46:38 -07:00
Mathias Agopian
dea20b1f34 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
33e85420b1 Merge "Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28" 2011-05-03 17:33:02 -07:00
Robert Ly
528bb11bd0 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
91c0b6c508 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
af35bf6440 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
9cff62220f 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
68cc53fe03 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
3d8070ba89 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
f8647fc367 Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1 2011-05-03 16:54:21 -07:00
Glenn Kasten
efd763ded8 Merge "Account for race condition when attaching HDMI." into honeycomb-mr1 2011-05-03 16:46:12 -07:00
Iliyan Malchev
697526bc9e 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
ec10d231c0 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
796fb04d32 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
4191242bf7 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
e4b117ad45 Merge "Fix a race-condtion in SurfaceFlinger that could lead to a crash." 2011-05-03 16:34:06 -07:00
Wink Saville
2ed006842b 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
4f11374018 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
b71fa02d0d 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
13947c3c65 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
d330455c29 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
41abd67302 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
Mathias Agopian
5b495067a0 Merge "improve documentation for the ROTATION_VECTOR sensor" 2011-05-03 15:36:23 -07:00
Mathias Agopian
29528fcdfd Merge "Add documentation for Sensor.TYPE_PRESSURE" 2011-05-03 15:25:42 -07:00
Adam Powell
1b79368ba6 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
d1e32f8ef6 Merge "Try fixing auto data inlining again." 2011-05-03 14:52:22 -07:00
Stephen Hines
f47db35db8 Merge "Clean up use of rsSetObject/rsClearObject." 2011-05-03 14:32:11 -07:00
Dan Morrill
4daf16cd59 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
78419fd016 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
95bf307d34 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
1c4c6b4581 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
7b741e2c8f Merge "Add an auto-exposure lock feature to the Camera API." 2011-05-03 11:07:33 -07:00
Eric Fischer
c3a08af8d9 Merge "Import revised translations." 2011-05-03 10:57:54 -07:00
Wink Saville
c1b4858ad9 am 3165f1a8: am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE 
* commit '3165f1a8eb707b36a6b2c66379c3fde85d9cc2fd':
  Make DataConnection asynchronous.
 2011-05-02 23:46:03 -07:00
Wink Saville
d05bbd383d am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE 
* commit 'd0d44c4e988ecdea86c2bb04e29d8f6d20c1c631':
  Make DataConnection asynchronous.
 2011-05-02 23:44:16 -07:00
Wink Saville
1c503c26e0 Merge "Make DataConnection asynchronous." into honeycomb-LTE 2011-05-02 23:41:29 -07:00
Adam Powell
1600a4b060 Merge "Refactoring of action bar internals" 2011-05-02 22:17:24 -07:00
Romain Guy
59591b9723 Merge "Allows to render with an OpenGL context inside a TextureView." 2011-05-02 18:33:26 -07:00
Mathias Agopian
5e1c464896 Merge "remove last traces of copybit" 2011-05-02 16:31:52 -07:00
Mathias Agopian
75c1535eb3 remove last traces of copybit 
Change-Id: Ia0f13a0ee6f702256482b5eb29d7fa2aa840bfc7
 2011-05-02 16:27:21 -07:00
Mike Lockwood
c01fd14880 Merge "MediaScanner: Add special casing of WMP album art files to isNoMediaPath()" 2011-05-02 16:09:26 -07:00
Robert Greenwalt
d27f9e0321 Merge "resolved conflicts for merge of db46fa25 to master" 2011-05-02 15:24:09 -07:00
Chet Haase
32034f2ec9 Merge "Line endcaps for AA lines are now antialiased." 2011-05-02 15:20:15 -07:00
Romain Guy
d3ff60d464 Merge "Remove unnecessary code." 2011-05-02 15:16:25 -07:00
Robert Greenwalt
b571f38927 resolved conflicts for merge of db46fa25 to master 
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
 2011-05-02 14:41:57 -07:00
Alex Sakhartchouk
de7be1a3e9 Merge "Moving renderscript GL code into the HAL This change affects - shaders - meshes - fonts - quad rendering" 2011-05-02 14:35:20 -07:00
Jason Sams
bc30781215 Merge "Temporarly disable auto-inbanding." 2011-05-02 14:33:05 -07:00