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

33539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Lockwood
b6d3de2d6d Merge "MediaScanner: Fix bug in "no media" handling logic" 2011-05-02 14:19:43 -07:00
Irfan Sheriff
50bd118429 am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit 'd369d64ee7931726d479e60e64d76a31fdba4a8f':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 13:29:36 -07:00
Robert Greenwalt
8fa31b3a39 am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
  Add RouteInfo objects for tracking routes.
 2011-05-02 13:29:22 -07:00
Robert Greenwalt
62bcdb5f45 Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
2f31356a2a am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 12:26:52 -07:00
Wink Saville
b2531a836b Resolve merge conflicts for merge of 21083066 to master. 
Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c
 2011-05-02 12:13:44 -07:00
Wink Saville
3a1c7d2601 am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState. 
* commit '0fa7d106d4e34559c6e208f731c319cf681c0583':
  Fix bug in RIL#getDataCallState.
 2011-05-02 12:05:02 -07:00
Wink Saville
745fa56f9a am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE 
* commit '7e74c60db5261ea137c8f6672f8573873eb5814e':
  Enhance AsyncChannel.
 2011-05-02 11:51:36 -07:00
Wink Saville
c2e50cd772 am aa44b52e: Fix bug in RIL#getDataCallState. 
* commit 'aa44b52ee07eb4937d23bb3c2464007a2eb3f50f':
  Fix bug in RIL#getDataCallState.
 2011-05-02 11:51:20 -07:00
Irfan Sheriff
581b155a43 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Wink Saville
9b81f6b0c1 Merge "Enhance AsyncChannel." into honeycomb-LTE 2011-05-02 10:47:05 -07:00
Conley Owens
e9981208de am a3dcd0a3: (-s ours) Merged "Adjust mBiggerTouchSlopSquare to the suitable value" 
* commit 'a3dcd0a3f1b48fc0d675db7e32c27415a14f6d08':
  Adjust mBiggerTouchSlopSquare to the suitable value
 2011-05-02 10:37:40 -07:00
Conley Owens
8abc2b7d1a am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with padding) into m 
* commit 'dddaa56f793ad9ecb4e20df746f562ac7f24d158':
  Scolling using arrow keys with padding
 2011-05-02 10:28:26 -07:00
Conley Owens
4c30f1027a Merge commit 'f395e304' into m 
Conflicts:
	core/tests/coretests/src/android/text/TextUtilsTest.java

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784
 2011-05-02 10:25:55 -07:00
Conley Owens
5511a49d8d am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" 
* commit '08acaec6df66bd6a12b1e63016ed998abff4afdc':
  Fixed to draw texture when loadTexture() is called at first time
 2011-05-02 10:12:00 -07:00
Conley Owens
36f57da49a am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." 
* commit '737b5c58c9094e5759bd4162f23f73be2b71faaf':
  Fixing wrong Japanese phone formatter.
 2011-05-02 10:11:56 -07:00