summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-18Merge cherrypicks of [9944759, 9944760, 9944761, 9943995, 9944763, 9942371, ↵android-10.0.0_r29android10-qpr1-d-releaseandroid-build-team Robot
9942372, 9942373, 9942374, 9944689, 9944690, 9944779, 9944766, 9944767, 9944483, 9944413, 9944801, 9944802, 9944803] into qt-qpr1-d-release Change-Id: I6eeccc0981d377e77ae0f0584d8df15b13cbd915
2019-12-18Don't leak input events to dumpsys on user buildsAshwini Oruganti
Remove the details of KeyEvent and MotionEvent logs. Bug: 139945049 Test: Tested on a device, the input functions work as expected and input event logs are not leaked to dumpsys on user builds. Change-Id: I98c9c375f18963177bf0c1d8829a217b4ad4acc6 Merged-In: I98c9c375f18963177bf0c1d8829a217b4ad4acc6 (cherry picked from commit a70a3ff7f2d34c68e2af738c1a1bcb66fe25e4a7)
2019-12-18Resize object capacity when shrinking ParcelMichael Wachenschwanz
Bug: 140419401 Test: atest android.os.cts.ParcelTest Change-Id: I04edee415e1984ba5fb97c5c1b09892a360cf221 (cherry picked from commit c67d9f33b36cbb95b121d058f51d6653f1ec4334) (cherry picked from commit d9d10dbdf2f20af3dd01376d2130c71c052e42f3)
2019-11-15Merge cherrypicks of [9735310, 9736237, 9736061, 9736062, 9736238, 9736299, ↵android-10.0.0_r25android-10.0.0_r24android-build-team Robot
9736300, 9735211, 9735311] into qt-qpr1-c-release Change-Id: I51f1ff56bd5029eac73d786014e87fe15da69006
2019-11-15Sensor: use FlattenableUtils::alignSteven Moreland
Since it memsets skipped over memory now. Bug: 141890807 Test: boot, check buffer is zero'd here Change-Id: Ieb3cd90215a3ccc1dc43365ecde251a50db08553 (cherry picked from commit d58cf5acb863eddbbeb9982439965e259045940e) (cherry picked from commit dbd0eecfc7570231d5cbb76678b0358c43ee6d3c)
2019-09-28Snap for 5907400 from 036ea7795e4a1f8ea67d473d5c44d382a8565e5f to ↵android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-c-s1-releaseandroid10-qpr1-b-s1-releaseandroid-build-team Robot
qt-qpr1-release Change-Id: Ie80ba940f5febe6a22320a6246421e9f85eb484f
2019-09-27[automerger skipped] GpuStats: refactor single stats pieces into a uniform ↵Yiwei Zhang
way am: 65a1504e80 -s ours am: 2a5a4d9782 -s ours am skip reason: change_id I2907065a55d03a6c1494737e6f0a77f6e94272eb with SHA1 b1c1a377a8 is in history Change-Id: I276e7f9039976133bccc31a43711b3dd24361ed4
2019-09-27GpuStats: refactor single stats pieces into a uniform wayYiwei Zhang
am: b1c1a377a8 Change-Id: I8210d44e46c9bc590ba0e2388516f9f852b92a1f
2019-09-27[automerger skipped] GpuStats: refactor single stats pieces into a uniform wayYiwei Zhang
am: 65a1504e80 -s ours am skip reason: change_id I2907065a55d03a6c1494737e6f0a77f6e94272eb with SHA1 b1c1a377a8 is in history Change-Id: I68e577b897c0c744aa9df7d9ffe5d9dbd9f2015b
2019-09-21Snap for 5892339 from fcf2c201ad8d353f6268a6c6f0363c7751f34a7c to ↵android-build-team Robot
qt-qpr1-release Change-Id: I7b1a6b5a1b7fd1709d3f581b68269f63b342d41d
2019-09-20Merge "SurfaceFlinger: tune number of buffers for low activity layers" into ↵TreeHugger Robot
qt-qpr1-dev
2019-09-20GpuStats: refactor single stats pieces into a uniform wayYiwei Zhang
This change makes it easy for adding single stats pieces into GpuService without adding or modifying the binder interface each time. Bug: 141003796 Test: adb shell dumpsys gpu Change-Id: I2907065a55d03a6c1494737e6f0a77f6e94272eb Merged-In: I2907065a55d03a6c1494737e6f0a77f6e94272eb
2019-09-20GpuStats: refactor single stats pieces into a uniform wayYiwei Zhang
This change makes it easy for adding single stats pieces into GpuService without adding or modifying the binder interface each time. Bug: 141003796 Test: adb shell dumpsys gpu Change-Id: I2907065a55d03a6c1494737e6f0a77f6e94272eb Merged-In: I2907065a55d03a6c1494737e6f0a77f6e94272eb
2019-09-20Merge "SurfaceFlinger: add grace time for present fence to signal" into ↵Ady Abraham
qt-qpr1-dev
2019-09-19Merge "Revert "Revert "SurfaceFlinger: add a sysprop for GL backpressure""" ↵Ady Abraham
into qt-dev am: 3f646b05fc am: c27d3ddd2f Change-Id: I27fae67b9d8d243680b592caf64326dbbfd17acb
2019-09-19Merge "Revert "Revert "SurfaceFlinger: add a sysprop for GL backpressure""" ↵Ady Abraham
into qt-dev am: 3f646b05fc Change-Id: I08185c54e1d88303c96e6c6fe96aded119d04024
2019-09-20Merge "Revert "Revert "SurfaceFlinger: add a sysprop for GL backpressure""" ↵Ady Abraham
into qt-dev
2019-09-19Revert "Revert "SurfaceFlinger: add a sysprop for GL backpressure""Ady Abraham
This reverts commit cc1ce6476e4deb8877c10b2a59afd27556ec72e9. Reason for revert: This change is needed to fix b/138083790. The underlying issue causing the first revert is now resolved. Change-Id: I82eeec5f5e66570e03f37294d7bbe15c41fec86e
2019-09-19SurfaceFlinger: add grace time for present fence to signalAdy Abraham
To avoid racing with HWVsync when SF wakeup at a small offset from vsync, we want to give a small grace period for the present fence to fire instead of just giving up on this frame. Bug: 141312250 Test: Set SF offset to 0 and observe systrace Change-Id: I713fad164fa2f4e0f00a2b4efaae063ac8f4a2b7 Merged-In: I713fad164fa2f4e0f00a2b4efaae063ac8f4a2b7
2019-09-19Snap for 5885124 from 5726d926a9eb0ccbe00236ff9e1303f4ea542396 to ↵android-build-team Robot
qt-qpr1-release Change-Id: I2fac9db14c01ed93d388fe78b68e753bf8e0a547
2019-09-18SurfaceFlinger: tune number of buffers for low activity layersAdy Abraham
Tune number of buffers indicating whether a layer is low activity or not to 2 accommodate more cases of low activity layers. Bug: 140948091 Test: 1) Set the static wallpaper 2) Go to Settings->About Phone -> scroll all the way down 3) Move device to Zone1 and launch settings page 4) Move device to Non Zone1 without touch and wait for 1-2 secs and observe Change-Id: I6a06fa4945843a8d991463c30cb0e6db68f99365
2019-09-18Merge "dumpstate: add dumptrace for audio HIDL 5.0" into qt-qpr1-devCarter Hsu
2019-09-14Snap for 5876498 from adf3724aeb737fa88e0e0213de7f30cf50dcae31 to ↵android-build-team Robot
qt-qpr1-release Change-Id: If25a64c69276c157d737fe806ffa12ff9e44d7f8
2019-09-12Merge "Update the minimum interval to resync to HWVsync" into qt-r1-devLong Ling
am: bdd785a4ea Change-Id: I73c0ca25db37a37b688fe5125f7e4614848dcac9
2019-09-13Merge "Update the minimum interval to resync to HWVsync" into qt-r1-devLong Ling
2019-09-12Update the minimum interval to resync to HWVsyncLong Ling
Bug: 140823887 Test: Manual test with Calculator apps Change-Id: I705c16534a616bc1a3af4402ba999eeb68871a3f
2019-09-12Merge "Revert "SurfaceFlinger: add a sysprop for GL backpressure"" into ↵Pete Bentley
qt-dev am: de17b13a2f am: 65dc300533 Change-Id: If20d660de54c22de9bbd7cd1a0c7c6bb7fcc2d7f
2019-09-12Merge "Revert "SurfaceFlinger: add a sysprop for GL backpressure"" into qt-devPete Bentley
am: de17b13a2f Change-Id: Icd0cd182c6399ff768a715e8ab04a5eb56d41152
2019-09-12Merge "Revert "SurfaceFlinger: add a sysprop for GL backpressure"" into qt-devPete Bentley
2019-09-12Revert "SurfaceFlinger: add a sysprop for GL backpressure"Pete Bentley
This reverts commit 4658e11cbe1abae691454ddcf93a06763d1bf828. Reason for revert: Seems to be responsible for breaking git_stage-aosp-master on aosp_arm64-eng, see b/140906153 Change-Id: I8968ca1bf95988b453bc33cd78a6389d6cb38a4f
2019-09-11dumpstate: add dumptrace for audio HIDL 5.0Carter Hsu
Test: dump bugreport Bug: 140849366 Change-Id: Ic02f4d022264c1541aa70f4c9760f0f96ba21aae Signed-off-by: Carter Hsu <carterhsu@google.com>
2019-09-11Snap for 5867030 from e0aedc2e744cb983dd2a3373d8bd114a4e1061f3 to ↵android-build-team Robot
qt-qpr1-release Change-Id: I3a76e32c089f12c3a7a3568d8eeee6d9b30fd9f8
2019-09-10Snap for 5863759 from b419fa8686633b112b3fa153e29528cb8821ee6c to ↵android-build-team Robot
qt-qpr1-release Change-Id: I0ba772f16febcf82949cf6ee9ba8fcf386442cf8
2019-09-10resolve merge conflicts of d916d941d89ec8fdcbc2bbe0bfdf0b0db1ad08b5 to ↵Adrian Salido
qt-qpr1-dev Test: I solemnly swear I tested this conflict resolution. Bug: 139557239 Change-Id: I4966f630b0e980e17cbbbcf9b280e034eaeb651e Merged-In: Ia85a60fde55afaed5106462942e0bb77652ec737
2019-09-09Merge "Use getLayerStack() instead of layerStack for input info" into ↵Chavi Weingarten
qt-qpr1-dev
2019-09-07SurfaceFlinger: do not choose POWER_SAVING as refresh rateAdy Abraham
Skip POWER_SAVING when looking for a content based refresh rate as it is not a real config. Test: Play 29fps video Bug: 140374873 Change-Id: Ia1be8b849e4ad3c59fdff084f2394e52bdb3828c Merged-In: Ia1be8b849e4ad3c59fdff084f2394e52bdb3828c
2019-09-06Use getLayerStack() instead of layerStack for input infochaviw
When there's no displayId, the layerStack should be used. The current code was using mDrawingState.layerStack which is incorrect because only the layerStack for the root of the tree is correct. Instead, use getLayerStack() which traverses the hierarchy to find the root's layerStack. Test: Uses correct layerStack instead of 0 for input with unset displayIds Fixes: 140312942 Change-Id: Ic8a06c562e970b0f328c539edfa51e206734934f Merged-in: Ic8a06c562e970b0f328c539edfa51e206734934f
2019-09-05SurfaceFlinger: Query Scheduler when updating allowed display configsDaniel Solomon
Currently two entities in SurfaceFlinger can set a new display refresh rate: (1) SurfaceFlinger core, and (2) Scheduler. It's possible for these two entities to get out of sync in the following way: 1) Scheduler updates the refresh rate to some rate 2) Upper layers call into SurfaceFlinger to update allowed display configs 3) SurfaceFlinger always sets display rate to max If the refresh rate from #1 and #3 don't match, it can leave the system in an inconsistent state, potentially causing visual and power issues. This change fixes this problem by changing step #3: Instead of always choosing the max refresh rate, SurfaceFlinger queries the optimal refresh rate from Scheduler. If that rate isn't available, only then does SurfaceFlinger default to the maximum rate. Bug: 139557239 Test: atest libsurfaceflinger_unittest Test: Manual: 1) Start with SurfaceFlinger idling (Scheduler selected RefreshRateType::DEFAULT) 2) Trigger a change in allowed display configs from DisplayModeDirector 3) Make sure the RefreshRateType SurfaceFlinger sets is DEFAULT instead of PERFORMANCE Change-Id: Ia85a60fde55afaed5106462942e0bb77652ec737 Merged-In: Ia85a60fde55afaed5106462942e0bb77652ec737
2019-09-05Snap for 5853686 from d6536aa908a82d909b99d81012fd3b258faf0d84 to ↵android-build-team Robot
qt-qpr1-release Change-Id: I1f1ba56e5b93023b2d1924b02767f8936892b3de
2019-09-04[automerger skipped] Restrict Automerge: Fix reinterpret_cast security bug ↵Valerie Hau
am: c38310ff54 -s ours am: ced29d99a7 am: c14f23093e Change-Id: Iec6e7552b3dd1dda332ac60724f1879930311206
2019-09-04[automerger skipped] Restrict Automerge: Fix reinterpret_cast security bug ↵Valerie Hau
am: c38310ff54 -s ours am: ced29d99a7 Change-Id: I7c5f7aefd7ed0a7a1dfcb0a10b541046fb54e94b
2019-09-04[automerger skipped] Restrict Automerge: Fix reinterpret_cast security bugValerie Hau
am: c38310ff54 -s ours am skip reason: subject contains skip directive Change-Id: I0fba66fc7b57a8220996596a8c1c56665ff10788
2019-09-03SurfaceFlinger: send config event changed on allowed modes changeAdrian Salido
am: ab6ef6c887 Change-Id: Ia8460b87510608cc00d37420d55fb19c1d109764
2019-09-02Restrict Automerge: Fix reinterpret_cast security bugValerie Hau
This patch fixes a security bug in SurfaceFlinger. Bug is due to a reinterpret_cast used when obtaining a sp<Layer> from an sp<IBinder> passed from a client. Without a checking mechanism, client could pass a malicious data packet. This is a modified cherry-pick of a patch by Rob Carr that utilizes a map to identify the appropriate layer based on the incoming IBinder token. Original patch commit: "Author: Robert Carr <racarr@google.com> Date: Thu Apr 11 13:18:21 2019 -0700 SurfaceFlinger: Validate layers before casting. Reinterpret casting random IBinder = no-fun. I first attempted to use inheritance of "getInterfaceDescriptor" in Layer::Handle but departing from "standard-layout" (e.g. using virtual methods) means that downcasting with static/reinterpret_cast is no longer valid. Instead I opted for the pattern the system-server uses of maintaing a map. Now that we look up the handle in a map rather than casting IBinder to Layer::Handle we need to make sure we have unique instances of the handle. In general this is true but we weren't doing this in the createWithSurfaceParent where we had an extra call to getHandle. Here we both refactor createWithSurfaceParent so it works with the new changes and also add protection for getHandle. We also fix an error where the handle map was populated outside of lock. " Bug: 137284057 Test: build, boot, manual, SurfaceFlinger_test Change-Id: I9b5f298db2da9cd974c423eb52f261a90f0d17dc
2019-08-28SurfaceFlinger: send config event changed on allowed modes changeAdrian Salido
Provide a notification whenever allowed display configurations have changed, this allows Display Event Receivers to be aware of a change in allowed configs. Bug: 139487676 Change-Id: Ida73391c350989be595f55ff8e1d9d2cc70c0276
2019-08-17Snap for 5811135 from 997a9135c10fc141310650f38928048438515070 to ↵android-build-team Robot
qt-qpr1-release Change-Id: I17ebadf2f645eca0b35106daf77f3f073b2faffb
2019-08-17Merge "Remove test image" into qt-r1-devAlec Mouri
am: 575149f8f0 Change-Id: I7f1b89fab475f7da9c8ebb7361339ac4a5a39631
2019-08-17Merge "Remove test image" into qt-r1-devTreeHugger Robot
2019-08-15Remove test imageAlec Mouri
Bug: 139427228 Test: builds Change-Id: I72ff075bbf878c39a17803b2d74181fbe045a3fb
2019-08-15Snap for 5803866 from 20256d2b4d5def8c3201f8070a799a37134d8723 to ↵android-build-team Robot
qt-qpr1-release Change-Id: Id6d253b0eebaa75857e1c88db91031337892462d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 19:55:23 +0000