summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * merge in jb-release history after reset to jb-devjellybean-stablejellybeanThe Android Automerger2012-06-260-0/+0
| | |\
* | | \ Merge "Put back old ion library"Rebecca Schultz Zavin2012-06-289-6/+212
|\ \ \ \
| * | | | Put back old ion libraryRebecca Schultz Zavin2012-06-289-6/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-backwards compatible changes are being made to the version in system core Change-Id: I66d5119fb28a7eb3dc6cb9f7cbd1a8a8d902f290 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* | | | | am 35e328cb: am 812f0cdd: fix full_maguro-userdebug buildKeun young Park2012-06-251-0/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit '35e328cb5be78e7823198e5a236e0d4dd36ef920': fix full_maguro-userdebug build
| * | | am 812f0cdd: fix full_maguro-userdebug buildKeun young Park2012-06-251-0/+2
| |\| | | | | | | | | | | | | | | | | | * commit '812f0cdd21be16f695df67670fb3370087400f8b': fix full_maguro-userdebug build
| | * | fix full_maguro-userdebug buildKeun young Park2012-06-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | - add libcutils and libcrypto to library list Change-Id: Ic395785b2e0bf2af137ba53f4682d1d184ac53ea
* | | | am b9bf3ee0: Reconcile with jb-releaseThe Android Open Source Project2012-05-240-0/+0
|\| | | | | | | | | | | | | | | * commit 'b9bf3ee004e70555219cd40b64e8eb1bcbf00df0':
| * | | Reconcile with jb-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I8b082311ec344c83c7483b92e1066799b0d14986
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | | |\
* | | | | am ca48276c: am c78626b1: CameraHal: Avoids possible race conditions while ↵Emilian Peev2012-05-237-91/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accessing \'mParams\' * commit 'ca48276c03af29e1e7f221f96bd2699cd4fa13c3': CameraHal: Avoids possible race conditions while accessing 'mParams'
| * | | | am c78626b1: CameraHal: Avoids possible race conditions while accessing ↵Emilian Peev2012-05-237-91/+84
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'mParams\' * commit 'c78626b15e9f29a5bcf85447ceafb17dcbf58b69': CameraHal: Avoids possible race conditions while accessing 'mParams'
| | * | | CameraHal: Avoids possible race conditions while accessing 'mParams'Emilian Peev2012-05-237-91/+84
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Direct access of 'mParams' outside of 'get-/setParameters()' should be avoided. The underlying strings can get invalidated with each call to 'setParameters()', which can lead to instabilities. - This change also removes legacy stereo code, which is not used any more. Bug: 6509329 Change-Id: Ief6df206c33fbdc666644cea8630e0bce6a36c00 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* | | | am 94d807c4: am 8fa731dd: Don\'t include widevine proprietary for panda.Jean-Baptiste Queru2012-05-221-0/+2
|\| | | | | | | | | | | | | | | | | | | * commit '94d807c4a2c6d0a8212669a3ca4f5d8a97e8dc04': Don't include widevine proprietary for panda.
| * | | am 8fa731dd: Don\'t include widevine proprietary for panda.Jean-Baptiste Queru2012-05-221-0/+2
| |\| | | | | | | | | | | | | | | | | | * commit '8fa731ddc4e629880eda7f1f69de4fc4556cb7cb': Don't include widevine proprietary for panda.
| | * | Don't include widevine proprietary for panda.Jean-Baptiste Queru2012-05-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no DRM support on panda. Bug: 6533487 Change-Id: I41c2ab72edb5b7fb1d440cb9248e5bd0bf37a0db
* | | | am d6204cf0: Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\| | | | | | | | | | | | | | | * commit 'd6204cf0bc6fddb04031510cca3cb44b2b4a6d4e':
| * | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I99645be9bd73a07efdbb60669775c6f38887dded
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | |\ \ | | | |/ | | |/|
* | | | Revert "hwc: Stash hdmi mode resolution in a property"Mike J. Chen2012-05-221-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ce768b26571c66e176fa6d10c64ded578da937d9. This should have been marked DO NOT MERGE in ics-aah.
* | | | am ce768b26: hwc: Stash hdmi mode resolution in a propertyMike J. Chen2012-05-211-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'ce768b26571c66e176fa6d10c64ded578da937d9': hwc: Stash hdmi mode resolution in a property
| * | | | hwc: Stash hdmi mode resolution in a propertyMike J. Chen2012-05-211-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The property can be read by apps like YouTube to choose lower resolution videos if the hdmi mode is < 1080p. Saves bandwidth, latency, and time wasted scaling. Change-Id: Iab46699f4ea2208f1f9475420d57ccf1e16214df Signed-off-by: Mike J. Chen <mjchen@google.com>
* | | | | am aca35afd: am 16b7f6c4: hwc: Fix truncation errors in scaling decisionLajos Molnar2012-05-211-4/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'aca35afd1da95e99a3b66c8a4864f9c70b2f7e70': hwc: Fix truncation errors in scaling decision
| * | | | am 16b7f6c4: hwc: Fix truncation errors in scaling decisionLajos Molnar2012-05-211-4/+8
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '16b7f6c4b06ac7350c30309d0559a466097d8ae7': hwc: Fix truncation errors in scaling decision
| | * | | hwc: Fix truncation errors in scaling decisionLajos Molnar2012-05-211-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When checking if we are downscaling beyond what the hardware supports, we were dividing by the factors rather than multiplying the other side with them. The truncation of the divisions had hwc allowing downscaling by a factor slightly larger than what was supported. Change-Id: I6ae4d897f4afe68ae26f0d7385e4003d6f2a4253 Signed-off-by: Lajos Molnar <lajos@ti.com>
* | | | | am 7a7d4c25: (-s ours) am 4495a871: Fix secondary builds (AOSP, panda) - do ↵Jean-Baptiste Queru2012-05-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not merge * commit '7a7d4c25c7362c011397219180c9b7e9afa9ce9c': Fix secondary builds (AOSP, panda) - do not merge
| * | | | am 4495a871: Fix secondary builds (AOSP, panda) - do not mergeJean-Baptiste Queru2012-05-211-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '4495a87138cd1f0fdf62a9c4649e2c2bdbd3527d': Fix secondary builds (AOSP, panda) - do not merge
| | * | | Fix secondary builds (AOSP, panda) - do not mergeJean-Baptiste Queru2012-05-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | liboemcrypto only exists in vendor/ builds BOARD_USES_SECURE_SERVICES isn't set in all builds Bug: 6521860 Change-Id: Ied82b1f8dc177feb710e8d9b0abd42fbfac4d9f9
* | | | | am 97160be1: (-s ours) DO NOT MERGEMike J. Chen2012-05-170-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '97160be189cd52b5cb8eecf97fd47ed034b54f5c': DO NOT MERGE
| * | | | DO NOT MERGEMike J. Chen2012-05-171-33/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c6c812aba62cf44f7f83c402cdc3318108a207ed. We're not going to support < 1080p without scaling after all. It was deemed too hard to correct the DPI issues and the number of users with 720p monitors is too small (about 15%). Signed-off-by: Mike J. Chen <mjchen@google.com>
* | | | | am c6c812ab: (-s ours) DO NOT MERGE:Mike J. Chen2012-05-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6c812aba62cf44f7f83c402cdc3318108a207ed': DO NOT MERGE:
| * | | | DO NOT MERGE:Mike J. Chen2012-05-161-134/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP4: HWC: Don't scale on non-1080p monitors Instead, we're going to use WindowManager's setForcedDisplaySize() API to have the apps draw to windows that are a subregion of the framebuffer and only show that on the HDMI output. We set a property when the mode is set so that Java code elsewhere (going into TungstenLEDService in a separate CL) can read it and pass it on to the WindowManager. This reverts a bunch of the scaling code that was introduced in Saket's change: 8e8bf69d94423df082460c43d818e58046b2d1de Change-Id: Ic6b12c5552bc75aee762ee71dd786d17da1f911f Signed-off-by: Mike J. Chen <mjchen@google.com>
* | | | | am fc8f4796: (-s ours) DO NOT MERGEDandawate Saket2012-05-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc8f4796e2893e4e0d6b9051fa7a37ecf522f0b8': DO NOT MERGE
| * | | | DO NOT MERGEDandawate Saket2012-05-041-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP4: HWC : Fix overlay assignement issue It was found that when there are more than 4 layers overlay 3 was gettig multiple assignements. This was causing the mouse pointer layer not to show on the screen. Change-Id: I422b772ed78f83db31f31060664b21ec31105642 Signed-off-by: Dandawate Saket <dsaket@ti.com> Signed-off-by: Muralidhar Dixit <murali@ti.com>
* | | | | am fff80172: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | * commit 'fff80172cafb42a06fa952a7412faaabe648f7c3':
| | | | |
| | \ \ \
| *-. | | | Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \| | | | | |_|/ / | |/| | / | | | |/ | | |/| Change-Id: I390214bd97cf63ec6bbf211b281eeb34f53b4a5e
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-100-0/+0
| | |\ \
| | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-080-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-070-0/+0
| | | | |\ \
| | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-020-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-010-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-190-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-110-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-280-0/+0
| | | | | | | | | | | | | | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 18:58:42 +0000