summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-03Merge "add default cpu.active power consumption" into android10-gsiandroid10-gsiTreehugger Robot
2020-09-02Merge "Merge branch android10-qpr3-release" into android10-gsiHung-ying Tyan
2020-09-01Merge branch android10-qpr3-releaseSzuWei Lin
Change-Id: Idf1b424376630fa37c0a6e7f3ca7f7e27975d333
2020-08-28Merge "Inherit source windowing mode in some cases." into android10-gsiTreehugger Robot
2020-08-28Inherit source windowing mode in some cases.Garfield Tan
We allow freeform windows on fullscreen displays launch activities in freeform windows if they'll be on the same display. Bug: 139274544 Bug: 163178199 Test: FreeformWindowingModeTests#testFreeformWindowManagementSupport passed on fullscreen display. Test: atest WmTests:TaskLaunchParamsModifierTests Change-Id: Ib1b75145c0b0b38b07bcde2ca66a1d772a2c2d0f Merged-In: Ib1b75145c0b0b38b07bcde2ca66a1d772a2c2d0f (cherry picked from commit 6a036e211f74510055611520f465a47adb1f0233)
2020-08-21add default cpu.active power consumptionHaoran.Wang
In CpuPowerCalculator it will calculate the power consumption based on the PowerProfile. But when the device run on the GSI image, the PowerProfile will not match the specific device's overlay. The default power_profile.xml which don't have cpu.active will make some multiple-cluster device have zero CPU power consumption calculation result. So added the default value for the cpu.active values which overlay by many devices. This patch help below cts-on-gsi get pass: run cts-on-gsi -m CtsStatsdHostTestCases -t android.cts.statsd.atom.UidAtomTests#testDeviceCalculatedPowerBlameUid run cts-on-gsi -m CtsStatsdHostTestCases -t android.cts.statsd.validation.BatteryStatsValidationTests#testPowerBlameUid TEST: run cts -m CtsStatsdHostTestCases -t android.cts.statsd.atom.UidAtomTests#testDeviceCalculatedPowerBlameUid Signed-off-by: Haoran.Wang <elven.wang@nxp.com> (cherry picked from commit 1d63546de956f152469cbbf015e301d14be34cbe) Change-Id: Ib08d466f247c8ee2d036c8fa41feecdf2003853f
2020-08-20Merge "Add NR to CellInfo" into android10-gsiTreehugger Robot
2020-08-11Add NR to CellInfoSarah Chin
Add HAL 1.4 to CellInfo, CellInfoNr, CellIdentityNr Test: atest RILTest Bug: 144874741 Change-Id: I9a34b57cebddb3be810b86080aff1022557c4c24 Merged-In: I9a34b57cebddb3be810b86080aff1022557c4c24 (cherry picked from commit 012ed94ad88ae77ce6d0ffbb2f7fd1af33f2a376)
2020-06-10Merge cherrypicks of [11816540, 11816001, 11816620, 11816559, 11816541, ↵android-10.0.0_r41android10-qpr3-releaseandroid-build-team Robot
11816621, 11815640, 11816506, 11816507, 11816508, 11816586, 11816587, 11816588, 11816589, 11816520, 11816173, 11816590, 11816591, 11816395, 11816003, 11816698, 11815507] into qt-qpr3-release Change-Id: I555a4b09aba6038255af30678de607a22f0a38b7
2020-06-10More fixes towards the race conditions in AMSJing Ji
Bug: 142986887 Bug: 140108616 Test: Manual Change-Id: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 Merged-In: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 (cherry picked from commit b2e84f0406139156442984943d8de7dd37d51368) (cherry picked from commit b581128020acb378d0a941f022151d7e2883e19c)
2020-06-10DO NOT MERGE Prevent ImageWallpaper from crashing due to wide gamutAhan Wu
ImageWallpaper may fail at either uploading texture or computing the histogram of the bitmap, we catch the unexpected exceptions to avoid crashing the whole process. In addition, we also take wide gamut into account while computing the histogram. Bug: 156087409 Test: Set 1.jpg of #34 in the bug as wallpaper. Test: The symptom should not happen. Change-Id: I931912ece0f7cdfcb388efc8e61799f0087c5199 (cherry picked from commit 34c8ecdf280d6209aa8163c1bc8f41a449302e39)
2020-06-10Merge "Add back enforceReadPermission for getmetadata" into ↵android-build-team Robot
snap-temp-L95100000592394136
2020-06-10Add back enforceReadPermission for getmetadataDiksha Gohlyan
Test: manually tested Bug: 151095863 Change-Id: I29ef120c10c488550b85269e598aeb6ff9505038 Merged-In: I4f04f08f76d039196c2c67bac80d4a46ebec87f2 (cherry picked from commit 71ec29b05022b06ffd4596dc8b339d2067cf58c0)
2020-06-10RESTRICT AUTOMERGELinus Tufvesson
This change is the union of I2aaab1903dee54190338f7b6e49888aa51437108 and I58834636e092f992e403342e36b475dc60e8f20a Original CL descriptions: *** I2aaab1903dee54190338f7b6e49888aa51437108 Block TYPE_PRESENTATION windows on default display ... and any other display that isn't considered a public presentation display, as per Display.isPublicPresentation() *** I58834636e092f992e403342e36b475dc60e8f20a Use TYPE_PRIVATE_PRESENTATION for private presentations Detect if the Presenation is targeting a private virtual display, and if they are use the windowType TYPE_PRIVATE_PRESENTATION. *** Bug: 141745510 Test: atest CtsWindowManagerDeviceTestCases:android.server.wm.PresentationTest CtsDisplayTestCases:android.display.cts.VirtualDisplayTest Change-Id: I9f1c4b140ab4bc6183151aafc5501e8648fbc3fa (cherry picked from commit d0746b46a5d8049a7105a16eb25c44810376527e)
2020-06-10Drop supplementary groups for child zygotes.Martijn Coenen
Child zygotes like Webview zygote and App zygote are created with an empty supplementary group list; this was intended to drop all groups, but instead we don't call setgroups() at all, which means that these child zygotes are run with the same groups as the parent zygotes. Currently those groups are AID_READPROC and AID_RESERVED_DISK, and the child zygotes should need neither: AID_READPROC is only used for wrapping with the wrap.com.packagename sysprop, which doesn't really make sense for child zygotes. AID_RESERVED_DISK shouldn't be needed because child zygotes and their children are not critical, and therefore shouldn't be able to use reserved disk space. Remove the groups by explicitly call setgroups(0, NULL); for child zygotes. Bug: 156741968 Test: observe /proc/zygote_pid/status, notice groups are empty Test: atest CtsExternalServiceTestCases Change-Id: I4ee43a8bb9d86ff6f620437fb290481365a9e988 (cherry picked from commit 5a45262741f6410a61bec59a41b4229e349a00b7)
2020-06-10Use killProcessGroup when killing app zygote.Martijn Coenen
To make sure we kill all untracked children, too. Bug: 156741968 Bug: 157598956 Test: manual inspection, PoC no longer works. Change-Id: I5d8efeb05ddec08a7fc7c00eabca6590c4cfdd8c (cherry picked from commit 0a91f61ac8387c02528e0f6f0948296ba9d5ca77)
2020-06-10Make implicit intent immutable.Jeff DeCew
(cherry picked from commit e42611f83cc72d22ed99fe3a8b79386d76ae5fa6) Test: make Fix: 154627439 Change-Id: Ifee830595bb145aede4dad1d9e42a20e54b6be66 Merged-In: Ifee830595bb145aede4dad1d9e42a20e54b6be66 (cherry picked from commit 7aae8cce330cb9b8ebca7b68da3abcd8e2d5a272)
2020-06-10Make intents immutableJulia Reynolds
Test: make Fixes: 154719656 Change-Id: I212ca5f1a48174ed85311b551259da314718f082 (cherry picked from commit 36b3352784ae90326a2b308542b1d2cfe18661a0) (cherry picked from commit 2a92eea73034820a20ba07cc267a326ace859d6d)
2020-04-29Merge "Multiply the total memory by mem_unit" into android10-gsiTreehugger Robot
2020-04-22Multiply the total memory by mem_unitJing Ji
Bug: 153107152 Test: Manual Change-Id: If268b1ea63d7166158ac546dd8a1f445eb3d09f9 (cherry picked from commit bfdf2d2ea382093fa0017d6400db1c87239d4693)
2020-04-08Snap for 6377241 from 27393d9f077b842d4611d8b1572e6fc62a5094c2 to ↵android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android10-qpr3-s1-releaseandroid-build-team Robot
qt-qpr3-release Change-Id: If021581c4b6d36e5e53c6f114f1b499c143921bc
2020-04-08Merge "DO NOT MERGE Fix ImageWallpaper memory regression" into qt-qpr1-devWu Ahan
2020-04-07Snap for 6373393 from 5a9674e3acdb491c15aceebb3632475caf4e7d44 to ↵android-build-team Robot
qt-qpr3-release Change-Id: Ia890158aa38cc97f421bc6d1504c9848f2233832
2020-04-07Merge "Require a more specific intent" into qt-dev am: 4305c5fbf8TreeHugger Robot
Change-Id: I768140bf923b20d721ad9afc66983437597277f2
2020-04-07Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-dev am: a2b7cd539eHall Liu
Change-Id: Ibe111442fec745063b27e9804c7125feee1fffc2
2020-04-07Merge "Require a more specific intent" into qt-devTreeHugger Robot
2020-04-07Merge "Fix order of uid/pid in LocationAccessPolicy" into qt-devHall Liu
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours am: 246360bf4f -s ours am: f562ffc53e -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 f4976307ce is in history Change-Id: Ib480a94dc261090ce99b407db66195c3143015d6
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours am: 246360bf4f -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 24e0f76afc is in history Change-Id: Iaeaef57c62a009c0f4625dfe75fc0b17a96334c2
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am: e3f2048ffc -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 bfa7796010 is in history Change-Id: I69aadc11e70ca60b1feadc30489986f00eb57507
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into oc-dev am: 0d01b03776 am: 6da62f7e0e -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 a481c86cd3 is in history Change-Id: I842025dc7002c0f4830ff77c91e3ed563199441c
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into oc-mr1-dev am: 097d107125 -s ours am: 7596bc9bb4 -s ours am: b21fff2664 -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 f4976307ce is in history Change-Id: I0032554402bd86f8783837b0b9c899a87d7eb991
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into pi-dev am: 4629c18c2b -s ours am: fa4aa76cac -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 f4976307ce is in history Change-Id: I1fd64d3babdfa9a645a6f7d45e751150b04bfb61
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into oc-mr1-dev am: 097d107125 -s ours am: 7596bc9bb4 -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 24e0f76afc is in history Change-Id: I5d823e06ccc7684de0ee19935effcb59c485096a
2020-04-07Merge "Verify all possible hosts that match web nav" into oc-dev am: 0d01b03776Chris Tate
Change-Id: I81ea478e735c5c3d571835a99edb1547885d76ab
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into pi-dev am: 4629c18c2b -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 24e0f76afc is in history Change-Id: Ib684e118ee19e25390524b0b895eb3396ba70136
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into oc-mr1-dev am: 097d107125 -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 bfa7796010 is in history Change-Id: I074ac74f576cff42b3b78c4739ea790054fd90a6
2020-04-07[automerger skipped] Merge "Verify all possible hosts that match web nav" ↵Chris Tate
into qt-dev am: b4714abf68 -s ours am skip reason: Change-Id If9ef0fc53d96e6581c56d86f89fe63bc9a5fb89a with SHA-1 f4976307ce is in history Change-Id: I0d336385094d1a0c4a4356241e77c2a31979db43
2020-04-07Merge "Verify all possible hosts that match web nav" into qt-qpr1-devChris Tate
2020-04-07Merge "Verify all possible hosts that match web nav" into qt-devChris Tate
2020-04-07Merge "Verify all possible hosts that match web nav" into pi-devChris Tate
2020-04-07Merge "Verify all possible hosts that match web nav" into oc-mr1-devChris Tate
2020-04-07Merge "Verify all possible hosts that match web nav" into oc-devChris Tate
2020-04-07DO NOT MERGE Fix ImageWallpaper memory regressionAhan Wu
Scale bitmap to fit display size leads to memory regression, this cl removes the sacling logic and also disable wallpaper transitions when the bitmap size is smaller than display size to avoid broken visual. We backport the solution to Q. Bug: 147379974 Bug: 145897588 Bug: 124838911 Test: Manually Test: atest com.android.systemui Test: adb shell dumpsys SurfaceFlinger, then check layer size of ImageWallpaper Merged-In: I243274af54538fc89268c448aa2c5a95f63c7ae3 Change-Id: If348748ec453f2b35b25576181c8a144496e258c
2020-04-06Merge "Merge cherrypicks of [10484934, 10484473, 10472987, 10481068] into ↵Automerger Merge Worker
qt-qpr2-release am: 13758c1cf2" into android10-gsi
2020-04-06Merge cherrypicks of [10484934, 10484473, 10472987, 10481068] into ↵android-build-team Robot
qt-qpr2-release am: 13758c1cf2 Change-Id: I0942f56ed2b0ddd6c0dde026aea65d667afbeb44
2020-04-06Merge "Merge cherrypicks of [10460465, 10460521, 10460352, 10458819] into ↵Automerger Merge Worker
qt-qpr2-release am: b8da4a2c13" into android10-gsi
2020-04-06Merge cherrypicks of [10460465, 10460521, 10460352, 10458819] into ↵android-build-team Robot
qt-qpr2-release am: b8da4a2c13 Change-Id: Ida08ffad4c097b2baccd91a4733ba6c884bb3aa2
2020-04-06Merge "Merge cherrypicks of [10297641, 10298303, 10298494, 10298514, ↵Automerger Merge Worker
10297196, 10298164, 10297642, 10297643, 10296046, 10296047, 10298245, 10298246, 10297197, 10297198, 10298495, 10298496] into qt-qpr2-release am: b0405c5c1f" into android10-gsi
2020-04-06Merge cherrypicks of [10297641, 10298303, 10298494, 10298514, 10297196, ↵android-build-team Robot
10298164, 10297642, 10297643, 10296046, 10296047, 10298245, 10298246, 10297197, 10297198, 10298495, 10298496] into qt-qpr2-release am: b0405c5c1f Change-Id: I987396adbeb8d8bdc163e920d5c8d06792a2e05d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 19:05:28 +0000