summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* frameworks/base: android_native_buffer_t -> ANativeWindowBufferIliyan Malchev2011-05-0324-117/+117
| | | | | Change-Id: Idc2eabaa805bb6d308ebb315872623f28d428417 Signed-off-by: Iliyan Malchev <malchev@google.com>
* frameworks/base: move ANativeWindow/android_native_buffer_t outIliyan Malchev2011-05-032-449/+2
| | | | | | | These definitions have been moved to system/core. Change-Id: I021b6b5f2fd72d538b5ccdcb33860ebd3004d9ad Signed-off-by: Iliyan Malchev <malchev@google.com>
* Merge changes I5c61ac40,I67c40a3c,I3e2ddd01Iliyan Malchev2011-05-0315-468/+717
|\ | | | | | | | | | | | | * 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
| * frameworks/base: switch CameraService to a HAL moduleIliyan Malchev2011-05-035-333/+675
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * frameworks/base: make the ANativeWindow query() method constIliyan Malchev2011-05-037-14/+15
| | | | | | | | | | | | | | 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>
| * frameworks/base: include system/core header camera.h in Camera.hIliyan Malchev2011-05-034-121/+27
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | am ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that ↵Wink Saville2011-05-032-0/+10
|\ \ | | | | | | | | | | | | | | | | | | IPSec could be configured/used." into honeycomb-LTE * commit 'ee081bf5ee936396a89d5bd2b29487047b260f49': IMS: Provide net_admin permission so that IPSec could be configured/used.
| * \ am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be ↵Wink Saville2011-05-032-0/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | configured/used." into honeycomb-LTE * commit '3ed0a1ec7aa6364c236721a1bd29fd196f259cba': IMS: Provide net_admin permission so that IPSec could be configured/used.
| | * \ Merge "IMS: Provide net_admin permission so that IPSec could be ↵Wink Saville2011-05-032-0/+10
| | |\ \ | | | | | | | | | | | | | | | configured/used." into honeycomb-LTE
| | | * | IMS: Provide net_admin permission so that IPSec could be configured/used.Ramesh Sudini2011-05-032-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMS configures the security database in kernel with keys generated from ISIM. Change-Id: Iae9fb85f286ff2a627369d784a127bf7d4d8f4b3
* | | | | Merge "Fix a race-condtion in SurfaceFlinger that could lead to a crash."Mathias Agopian2011-05-032-11/+21
|\ \ \ \ \
| * | | | | Fix a race-condtion in SurfaceFlinger that could lead to a crash.Mathias Agopian2011-05-032-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 2d40bf91: am eac835e5: am 9c4ba258: Merge "Removing dead store; it was ↵Conley Owens2011-05-031-1/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | likely a relict of debuging code." * commit '2d40bf91e6ad71505ec84743c5ad0b854ecf5928': Removing dead store; it was likely a relict of debuging code.
| * | | | am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict ↵Conley Owens2011-05-031-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of debuging code." * commit 'eac835e52e8378b33a2b34b7edb803290154588d': Removing dead store; it was likely a relict of debuging code.
| | * \ \ \ am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging ↵Conley Owens2011-05-031-1/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code." * commit '9c4ba2580e2ef582747cce2960804a2a5e4b776e': Removing dead store; it was likely a relict of debuging code.
| | | * \ \ \ Merge "Removing dead store; it was likely a relict of debuging code."Conley Owens2011-05-021-1/+0
| | | |\ \ \ \
| | | | * | | | Removing dead store; it was likely a relict of debuging code.Jozef BABJAK2011-04-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I685c6df119212f48f90dd40d01a3638a33ce2800
* | | | | | | | Merge "improve documentation for the ROTATION_VECTOR sensor"Mathias Agopian2011-05-031-0/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | improve documentation for the ROTATION_VECTOR sensorMathias Agopian2011-05-021-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the documentation didn't specify which reference coordinate system was used. Change-Id: I5ff5d1041b59de365863db6ee34cc9d823801d34
* | | | | | | | | Merge "Add documentation for Sensor.TYPE_PRESSURE"Mathias Agopian2011-05-031-0/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Add documentation for Sensor.TYPE_PRESSUREMathias Agopian2011-05-021-0/+6
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I634722a9a22946a1ae96c0b868af0c66d467a3a6
* | | | | | | | Merge "Fix bug 4345702 - update action bar tab views when the Tab object is ↵Adam Powell2011-05-033-23/+64
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | updated"
| * | | | | | | | Fix bug 4345702 - update action bar tab views when the Tab object isAdam Powell2011-05-033-23/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated Also fix a bug with visibility of split action bar views. Change-Id: Iadd63d5e9b6cb9debab0f7a777e424e4c4807a13
* | | | | | | | | Merge "Try fixing auto data inlining again."Jason Sams2011-05-031-5/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Try fixing auto data inlining again.Jason Sams2011-05-021-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I95113db85551cbee774250eacb69553af1cf27bc
* | | | | | | | | | Merge "Clean up use of rsSetObject/rsClearObject."Stephen Hines2011-05-034-15/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clean up use of rsSetObject/rsClearObject.Stephen Hines2011-05-024-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d8e198135d680a1cab7fde64407dec8030bd6a6
* | | | | | | | | | | am e21f3764: (-s ours) am 75c66458: am 8325c3a8: Backporting ↵Dan Morrill2011-05-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | am 75c66458: am 8325c3a8: Backporting ↵Dan Morrill2011-05-031-0/+13
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | | | am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to ↵Dan Morrill2011-05-031-0/+13
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | | | | | | Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New changeDan Morrill2011-05-021-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since file was renamed, making cherry-pick impossible. Change-Id: Idc802af57fb9926a69ed52d4e776ef57d8b647c6
* | | | | | | | | | | Merge "Add an auto-exposure lock feature to the Camera API."Eino-Ville Talvala2011-05-033-0/+100
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add an auto-exposure lock feature to the Camera API.Eino-Ville Talvala2011-05-023-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new camera parameter for locking auto-exposure to its current value. Also adds a function for checking if auto-exposure lock is supported by the current platform. Hidden for now. Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
* | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-05-037-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import revised translations.Eric Fischer2011-05-027-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92ddc1605925204449ca8d1aa7148e1f2681ee36
* | | | | | | | | | | | | am 3165f1a8: am d0d44c4e: Merge "Make DataConnection asynchronous." into ↵Wink Saville2011-05-029-410/+778
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | / / / / / | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '3165f1a8eb707b36a6b2c66379c3fde85d9cc2fd': Make DataConnection asynchronous.
| * | | | | | | | | | | am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTEWink Saville2011-05-029-410/+778
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd0d44c4e988ecdea86c2bb04e29d8f6d20c1c631': Make DataConnection asynchronous.
| | * | | | | | | | | | Merge "Make DataConnection asynchronous." into honeycomb-LTEWink Saville2011-05-029-410/+778
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Make DataConnection asynchronous.Wink Saville2011-05-029-410/+778
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0e01dded25ba1fdb3b2c6d0f95a1193f608a0e0
* | | | | | | | | | | | | Remove debug loggingAdam Powell2011-05-021-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1a8ef5461b98239d8f55f842e1043b6b3d0f070
* | | | | | | | | | | | | Merge "Refactoring of action bar internals"Adam Powell2011-05-0213-253/+461
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refactoring of action bar internalsAdam Powell2011-05-0213-253/+461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split action bar implementation details. Factor out common components into AbsActionBar. Layout rules for the lower half of split action bars. Change-Id: I6bc39ba6c343055597880a7d4663dd8f30aa4999
* | | | | | | | | | | | | | Merge "Allows to render with an OpenGL context inside a TextureView."Romain Guy2011-05-0222-56/+512
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Allows to render with an OpenGL context inside a TextureView.Romain Guy2011-05-0222-56/+512
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I59453f7fc3997f0502a1c5d325d37fed376fabc7
* | | | | | | | | | | | | | | Merge "remove last traces of copybit"Mathias Agopian2011-05-023-18/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | remove last traces of copybitMathias Agopian2011-05-023-18/+0
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia0f13a0ee6f702256482b5eb29d7fa2aa840bfc7
* | | | | | | | | | | | | | | Merge "MediaScanner: Add special casing of WMP album art files to ↵Mike Lockwood2011-05-021-29/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isNoMediaPath()"
| * | | | | | | | | | | | | | | MediaScanner: Add special casing of WMP album art files to isNoMediaPath()Mike Lockwood2011-05-021-29/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent MediaProvider from adding these files to the images table Change-Id: I496a108b52a481c78dbf58c4e62996656b1fcbb9 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of db46fa25 to master"Robert Greenwalt2011-05-0210-75/+324
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of db46fa25 to masterRobert Greenwalt2011-05-0210-75/+324
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
generated by cgit v1.1 at 2025-02-06 20:09:24 +0000