summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of ↵HEADreplicant-6.0-0001replicant-6.0Wolfgang Wiedmeyer2017-05-024-7/+4
|\ | | | | | | https://github.com/LineageOS/android_frameworks_native into replicant-6.0
| * Fix security vulnerabilityFabien Sanglard2017-04-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | AOSP-Change-Id: I4c9ea3a3177131fa29d2561da71ef18bec3af108 Test: angler, marlin Bug: 32628763 CVE-2017-0546 Change-Id: I3e87518163540a9fce1d4fc3751ed558d4854140 (cherry picked from commit 45b202513ba7440beaefbf9928f73fb6683dcfbd)
| * Fix SF security vulnerability: 32706020Fabien Sanglard2017-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Because of lack of mutex lock when get mConsumerName, if one thread getConsumerName, another thread setConsumerName frequently, an UAF will be triggered. Change-Id: Id1bbf0d15de6d16def2f54ecade385058cda3b65 Test: Marling with poc provided in bug report. Bug: 32706020 (cherry picked from commit d073eb7a3f28fd74bfa24c8b7599465cb7de5436) (cherry picked from commit 2e16d5fac149dab3c3e8f1b2ca89f45cf55a7b34)
| * Correct overflow check in Parcel resize codeChristopher Tate2017-03-131-2/+2
| | | | | | | | | | | | | | | | | | Fix merge conflict into nyc-mr1-release Bug 31929765 Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467 (cherry picked from commit 65dd433f0db2fe402dc725f7012c6e26769b3224) (cherry picked from commit b4d6b292bce7d82c93fd454078dedf5a1302b9fa)
| * libEGL: Only enable WORKAROUND_BUG_10194508 with board flagD. Andrei Măceș2017-02-191-3/+0
| | | | | | | | Change-Id: Id0d000dc5397479a0cd73799f93861693179a663
* | Merge branch 'cm-13.0' of ↵Wolfgang Wiedmeyer2017-02-111-0/+1
|\ \ | |/ | | | | https://github.com/LineageOS/android_frameworks_native into replicant-6.0
| * Fix SF security vulnerability: 32660278Fabien Sanglard2017-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Because of lack of mutex lock when get mSidebandStream, if one thread getSidebandStream, another thread setSidebandStream frequently, an UAF will be triggered. Bug: 32660278 Test: Marlin device with poc Change-Id: Idbcf0976ce2db682d0f13455105c45a5c7481a45 (cherry picked from commit 2d8a2432e04234d9edbb3b099f9bbbaa36ad4843) (cherry picked from commit 675e212c8c6653825cc3352c603caf2e40b00f9f)
* | SurfaceFlinger: disable VSync thread if no clients requiring.Wang, Yue A2017-01-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In EventThread, 2 VSYNCs are needed to do composition and update the client status. So, a 30FPS video may leads to 60FPS VSYNC, which means the DispSync thread would be waked 60FPS. This is a unexpected behavior which takes more power consumption. Now we update the SF status soon after the first VSYNC, which means no extra VSYNC needed, and the DispSync could be awaked as expected, and consequently power get saved. Change-Id: If486eb9b87f109a71f71b510768f15dd733f1233 Orig-Change-Id: I1d3b166021e15a81b2ad770b039761fc2c15fddf Tracked-On: https://jira01.devtools.intel.com/browse/IMINAN-12211 Category: aosp improvement Domain: Graphics-SF Origin: internal Upstream-Candidate: yes Signed-off-by: Wang, Yue A <yue.a.wang@intel.com> Reviewed-on: https://android.intel.com:443/238344
* | Merge branch 'cm-13.0' of ↵Wolfgang Wiedmeyer2016-12-1345-91/+1007
|\ \ | |/ | | | | https://github.com/CyanogenMod/android_frameworks_native into replicant-6.0
| * Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-062-3/+10
| |\ | | | | | | | | | | | | | | | | | | Android 6.0.1 Release 72 (M4B30X) # gpg: Signature made Tue 04 Oct 2016 09:47:41 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| | * ServiceManager: Allow system services running as secondary users to add servicesArve Hjønnevåg2016-08-262-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be reverted when all system services have been cleaned up to not do this. A process looking up a service while running in the background will see the service registered by the active user (assuming the service is registered on every user switch), not the service registered by the user that the process itself belongs to. BUG: 30795333 Change-Id: I1b74d58be38ed358f43c163692f9e704f8f31dbe (cherry picked from commit e6bbe69ba739c8a08837134437aaccfea5f1d943)
| | * DO NOT MERGE ServiceManager: Restore basic uid checkArve Hjønnevåg2016-08-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent apps from registering services without relying on selinux checks. Bug: 29431260 Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b (cherry picked from commit f03ba2c0d878071603d73b7f8e9a4a468364ac27)
| | * Region: Detect malicious overflow in unflattenPablo Ceballos2016-08-161-0/+5
| | | | | | | | | | | | | | | | | | Bug 29983260 Change-Id: Ib6e1cb8ae279010c5e9960aaa03513f55b7d873b
| * | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:47 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| | * | Region: Detect malicious overflow in unflattenPablo Ceballos2016-07-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Bug 29983260 Change-Id: Ib6e1cb8ae279010c5e9960aaa03513f55b7d873b
| * | | surfaceflinger: Add support for Exynos HWC servicesChristopher N. Hesse2016-08-182-0/+50
| | | | | | | | | | | | | | | | Change-Id: I600e946a22064d64549e266c5a3cf452d0cf6299
| * | | Fix xxhdpi 3072 heap sizesAbhisek Devkota2016-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bootloops on r7 with current values Fix for 94774ac01d1953bcc7a70a7018267ee34793d3f7 Change-Id: I248a9375735a261715668494da0d0ab5a6440d42
| * | | Fix xxxhdpi 3072 heap sizesAbhisek Devkota2016-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bootloops on shamu with current values Fix for 94774ac01d1953bcc7a70a7018267ee34793d3f7 Change-Id: Iade253bd8bc5074486d2d69bb9c738844615b08d
| * | | dalvik: rework 3 and 4-GB dalvik heap configurationsAlex Naidis2016-08-153-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous configuration sets target utilization as .25, which is geared towards low memory devices. This path increases it to .75 and makes us pass the check: (heaptargetutilization / 2) * heapsize = heapgrowthlimit Example: heapgrowthlimit: 256m heapsize: 512m heaptargetutilization: 0.75 0.75/2 * 512 = 192 To pass the check this has to be true: 192 = 256 (WRONG) Check not passed. This new configuration is optimized for higher RAM devices and passes the check: heapgrowthlimit: 384m heapsize: 1024m heaptargetutilization: 0.75 0.75/2 * 1024 = 384 384 = 384 (TRUE) Check passed. Change-Id: I6839339382229da80546761c3746a032081ff2cd Signed-off-by: Alex Naidis <alex.naidis@linux.com>
| * | | surfaceflinger: Access s3d flags only for valid display ID.Namit Solanki2016-08-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Check if display id is within display ID range. Negative display ids lead to undefined behavior in CTS tests. Change-Id: I2db8caf8d7ac65700e5bc37c180763357cc90aad CRs-Fixed: 1043297
| * | | Fixed stylus eraser being rejected by palm rejectionFPtje2016-08-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stylus eraser appeared not to work, i.e. Android did not respond to input from the eraser. It turned out that all input except stylus input is rejected when palm rejection is activated. The problem was that the eraser itself activates palm rejection when it hovers. The solution is to allow the eraser during palm rejection. This solution makes sense because the eraser input works in the exact same way as normal stylus input. Change-Id: I9c7451112ce7dbca14a1e1694eedca2d4ed041a1
| * | | surfaceflinger: Fix uninitialized variableSteve Kondik2016-08-032-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | * And don't try to reinit the lib after a failure. Change-Id: Ic055a48670ed8cf01e27b16c5d4ddf214db53d20
| * | | surfaceflinger: Unbreak casting and other use casesSteve Kondik2016-08-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * If QCOM WFD isn't in use, we'll get -1 here. Don't try and dig into the array because we'll get some random memory back. Change-Id: Ib14642fea760dc0e659473bb183c5e0116622302
| * | | surfaceflinger: Add check for number of queued buffersAnjaneya Prasad Musunuri2016-08-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pop buffer item from shadow queue only when number of queued buffer items is greater than zero. Change-Id: I039bc133842293c29e3e130efd65f521ef0049c6 CRs-Fixed: 1009466
| * | | Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-021-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Android 6.0.1 Release 61 (MOB30Z) Change-Id: I581a4bc571ffe74fe33956018ffd93df05263755
| | * | Add FrameStats default constructorPablo Ceballos2016-06-231-0/+1
| | |/ | | | | | | | | | | | | | | | Bug 28592402 Change-Id: I857e46c9ab3ffae0d96923d665d13a4128a6cafa
| * | sf: Fix compliation for non-8996 platformsdianlujitao2016-08-021-0/+6
| | | | | | | | | | | | Change-Id: I3edad5934ef9d9ec523e091fa2c959bbc9770f29
| * | surfaceflinger: Isolate S3D code to msm8996 onlySteve Kondik2016-08-014-6/+9
| | | | | | | | | | | | Change-Id: Ie4b77b55eb306c795b452c59d8ae3383bd2804bc
| * | surfaceflinger: Cleanups for blurSteve Kondik2016-08-013-28/+109
| | | | | | | | | | | | | | | | | | * Dynamically load it so no direct linkage or headers are required. Change-Id: I4eba035f527ae4f0fa2485e24a8586145baf0adc
| * | sf: Allow HWC composition of virtual displays for HDMI primaryTatenda Chipeperekwa2016-07-311-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | Allow HWC composition of virtual displays for HDMI primary only when the output pixel format of the HDMI display is RGB. CRs-Fixed: 1007249 Change-Id: I9680b162d844e9e6397f919e8dcc1b1a948d182c
| * | SF: Add support to draw S3D framebuffer targetfeifanz2016-07-319-1/+263
| | | | | | | | | | | | | | | | | | | | | | | | Add support to draw S3D framebuffer target in case HWC driver can not handle due to resource or capability issue. Change-Id: I536fa4a03e246d51891045b692d5dc5be88f2adf CRs-fixed: 999055
| * | surfaceflinger: Fix the fix of the opaque check fixSteve Kondik2016-07-241-1/+1
| | | | | | | | | | | | | | | | | | * Use the right define. Change-Id: I78e2aea4bf4ff933ec828cffee1a3e925622ad31
| * | SF: Fix NULL pointer dereferencing in dumpDrawCycle()Ramkumar Radhakrishnan2016-07-201-0/+4
| | | | | | | | | | | | | | | | | | | | | Check for NULL before dereferencing a pointer in dumpDrawCycle() Change-Id: I1f06214577d0065c988877acb0f1b4378080690f CRs-Fixed: 1018335
| * | SF: Add support for all flips of panel mountSaurabh Shah2016-07-204-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for all flips of panel mount, H, V, HV (180). Property persist.panel.mountflip can be set to 1 for H-Flip, 2 for V-Flip, 3 for HV-Flip (180 / inverse mount). Change-Id: Ide7b8378ad6a423e5d7335fedc27d480a25b53ae CRs-fixed: 990622
| * | DO NOT MERGE: dumpstate: execute procrank using suNick Kralevich2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | procrank is a setuid binary which only exists on userdebug/eng builds. Instead of executing the setuid binary, run the binary using the su command. This eliminates one more setuid binary, and allows the tightening of the SELinux policy. Bug: 18342188 (cherry picked from commit 2b1f88b6ac78e330ff006da6fecf8bc9d976ec67) Bug: 25951005 Change-Id: I90c86f89974b3878273a29277b2a5d5d7c4b81c7
| * | SF: more DispSync improvements.Haixia Shi2016-07-202-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the reference time to DispSyncThread. Since the phase offset is calculated using timestamps relative to the reference time, we must also adjust the phase offset by the same reference time when computing the next refresh time. Always reset phase offset to zero when updating the reference time because the reference time equals the first timestamp. After beginResync() we need to keep HW vsync enabled until the model is updated. Bug: 25113115 Change-Id: I8eae227bee91c24a99bf8e57fbebceb98d29c77d Test: check in systrace that app/sf vsync events have correct phase
| * | SF: use first sample timestamp as reference.Haixia Shi2016-07-202-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use the absolute 64-bit nsecs_t timestamp directly in phase and error calculations. Compared to the estimated vsync period, the timestamp tend to many orders of magnitudes larger, and consequently the integer modulo operation used to calculate phase and error can be very sensitive to tiny fluctuation in vsync period. Bug: 25113115 Test: set kTraceDetailedInfo=true; see Phase and Error are stable in systrace Change-Id: I687703eec31b1072c606898c0424a96c0a8ca033
| * | sf: Fix blending mode for legacy BSPArne Coucheron2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | * After 0c5f3af, glitches when blending is observed on A family devices. Modify ifdef to not include QCOM_BSP_LEGACY. Change-Id: Ibb53df5709abbb0e7132065aec23a14f7accf4b3
| * | system_server BINDER_TYPE_FD driver ashmem accessorsMark Salyzyn2016-07-151-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check if device matches the ashmem rdev, before calling ashmem_get_size_region. This eliminates making this call when associated with other driver file descriptors. Bug: 26374183 Bug: 26918423 Bug: 26871259 Change-Id: I1f88c2c93ea35a73c8e14125f3d1a6c67fa4f15b
| * | system_server BINDER_TYPE_FD sockets using ashmem accessorsMark Salyzyn2016-07-151-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check if device is a character device, before calling ashmem_get_size_region. We do not check if the st_rdev matches /dev/ashmem. So this at least eliminates making this call when associated with a socket. Bug: 26374183 Change-Id: I68ed9d1c2cd4c47228ed065e3e18eb4151f038f4
| * | Parcel: file descriptor leakMark Salyzyn2016-07-151-4/+3
| | | | | | | | | | | | | | | | | | | | | Resolve a file descriptor leak when a request for ashmem size adjustment is not filed. Change-Id: I4ebccfd096ec5313725fd99dc3e025f9561d061f
| * | sf: Make sure HWC_BLENDING_NONE is set for opaque layerradhakrishna2016-07-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Before configuring the layers to HWC, make sure HWC_BLENDING_NONE is set if the layer is opaque Change-Id: Ie84aa9d93e98a244692a0cffc2de653a9079f8b4 Crs-fixed: 957373
| * | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-071-1/+7
| |\ \ | | |/ | | | | | | | | | | | | Ticket: CYNGNOS-3020 Change-Id: I13076de5caf1546b8eef44417ee83cd9b2cb9d62
| | * Correctly handle dup() failure in Parcel::readNativeHandleMarco Nelissen2016-05-271-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | bail out if dup() fails, instead of creating an invalid native_handle_t Bug: 28395952 Change-Id: Ia1a6198c0f45165b9c6a55a803e5f64d8afa0572
| * | sf: Only apply hwrotation to primary displaysChristopher N. Hesse2016-06-171-1/+1
| | | | | | | | | | | | Change-Id: Ib51030cec5ce7609f12be9a5e46310f75442b680
| * | Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-075-3/+61
| |\ \ | | |/ | | | | | | | | | | | | | | | Android 6.0.1 release 46 # gpg: Signature made Mon 06 Jun 2016 10:38:23 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| | * Add new MotionEvent flag for partially obscured windows.Michael Wright2016-04-215-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to more complex window layouts resulting in lots of overlapping windows, the policy around FLAG_WINDOW_IS_OBSCURED has changed to only be set when the point at which the window was touched is obscured. Unfortunately, this doesn't prevent tapjacking attacks that overlay the dialog's text, making a potentially dangerous operation seem innocuous. To avoid this on particularly sensitive dialogs, introduce a new flag that really does tell you when your window is being even partially overlapped. We aren't exposing this as API since we plan on making the original flag more robust. This is really a workaround for system dialogs since we generally know their layout and screen position, and that they're unlikely to be overlapped by other applications. Bug: 26677796 Change-Id: I9e336afe90f262ba22015876769a9c510048fd47
| * | Add dalvik heap/hwui overrides for xxxhdpi phone with 4096MB RAMLouis Popi2016-05-312-0/+55
| | | | | | | | | | | | Change-Id: I8e7bd9b520c20e0cd07c9b17d74e4ae79f2769b4
| * | dumpstate: add CM version to outputScott Mertz2016-05-261-0/+3
| | | | | | | | | | | | Change-Id: Ibd804872d7d32ac1d26efaf30927a2359d2da287
| * | Add dalvik heap/hwui overrides for xxhdpi phone with 3072MB RAMLouis Popi2016-05-242-0/+55
| | | | | | | | | | | | Change-Id: I0ebf2033341e8f09004c1e2dec5f4438aa52e5dc
generated by cgit v1.1 at 2024-04-27 00:52:13 +0000